Merge lp:hopper into lp:hopper/future

[Daniel Bell]

Updating from Legacy release 0.2.

This updates future to version 0.2 + a few other changes from upcoming 0.3 version.

=== removed file 'Frogger/CHANGES'
--- Frogger/CHANGES	2010-01-29 23:57:26 +0000
+++ Frogger/CHANGES	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Frog Game (0.1)
-
-  * Moved Game to Python, instead of C#.
-  * Support for Linux and Mac OS X in addition to Windows.
-  * Fixed issues with CPU usage.
-  * Difficulty increases every level now instead of every 5: Still basic difficulty (speed increase only).
-  * Log size reduced to remove ability to slide from log to log on same level. 
-  * Balancing on log removed. Currently a single pixel on log will be enough to prevent you from landing in water. (LP #514564)
-  * New Menu/Exit Screen. 
-  * New Font: Blooming Grove released under Public Domain by Jonadab the Unsightly One (http://openfontlibrary.org/media/files/jonadab/414)
-
-  -- Daniel Bell <[e-mail]> Fri, 29 Jan 2010.
-
-Frog Game (prototype)
-
-  * Initial prototype to test the game concepts.
-
- -- Daniel Bell <[e-mail]> Sat, 12 Dec 2009.
-    
 
=== added file 'Frogger/COPYING'
--- Frogger/COPYING	1970-01-01 00:00:00 +0000
+++ Frogger/COPYING	2010-03-12 10:44:17 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
=== added file 'Frogger/ChangeLog'
--- Frogger/ChangeLog	1970-01-01 00:00:00 +0000
+++ Frogger/ChangeLog	2010-03-12 10:44:17 +0000
@@ -0,0 +1,34 @@
+Frog Game 0.3:
+    * Renamed CHANGES to ChangeLog.
+    * Renamed LICENSE to COPYING.
+    * Added INSTALL file (to instruct on how to install on Linux).
+    * Removed setup-win.py and setup-mac.py and created a single setup.py file.
+    * Added Package 'lib' to handle shared logic.
+    * Added frog.game.desktop file.
+    * Changed color of "safe" spots on background.png
+    
+Frog Game 0.2:
+	* Changed the objectives of the game to make the game more original.
+	* Changed game resolution to 800x600 instead of 600x800.
+    * Removed DOUBLEBUF and colour depth flags from display.
+	* Some general clean up and optimization of Frog Game.
+	* Fixed issues with font rendering (LP: #514236)
+    * You can now hold to move the Frog.
+	
+Frog Game 0.1:
+  	* Moved Game to Python, instead of C#.
+  	* Support for Linux and Mac OS X in addition to Windows.
+  	* Fixed issues with CPU usage.
+  	* Difficulty increases every level now instead of every 5: 
+      Still basic difficulty (speed increase only).
+  	* Log size reduced to remove ability to slide from log to log on
+      same level. 
+  	* Balancing on log removed. Currently a single pixel on log will
+      be enough to prevent you from landing in water. (LP: #514564)
+  	* New Menu/Exit Screen. 
+  	* New Font: Blooming Grove released under Public Domain by Jonadab
+      the Unsightly One (http://openfontlibrary.org/media/files/jonadab/414)
+
+Frog Game prototype: 
+  * Initial prototype to test the game concepts.
+    
 
=== added file 'Frogger/INSTALL'
--- Frogger/INSTALL	1970-01-01 00:00:00 +0000
+++ Frogger/INSTALL	2010-03-12 10:44:17 +0000
@@ -0,0 +1,5 @@
+install python pygame library ("python-pygame" on Debian/ubuntu) and run:
+
+    ./setup.py install
+
+Note that this is not as complete as a package install at the moment - e.g. GNOME menu integration will not happen and there is no uninstall option.
 
=== removed file 'Frogger/LICENCE'
--- Frogger/LICENCE	2010-01-29 23:57:26 +0000
+++ Frogger/LICENCE	1970-01-01 00:00:00 +0000
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
=== modified file 'Frogger/README'
--- Frogger/README	2010-01-29 23:57:26 +0000
+++ Frogger/README	2010-03-12 10:44:17 +0000
@@ -1,49 +1,69 @@
-Frog Game is (C) Daniel Bell <[e-mail]>, 2009-2010.
-
-About:
-
-Frog Game is a fun survival game based upon the awesome arcade game: Frogger.
-This game was originally created by Daniel Bell as a University project for a first year module in 2009.
+Copyright (C) 2009, 2010 Daniel Bell <[e-mail]>
+
+BACKGROUND:
+Frog Game is a fun survival/rescue game loosely based upon the awesome arcade game: Frogger.
+
+This game was originally created by as a University project for a module in the first year.
 It was created using Visual Studio 2008 and the objective was to create a prototype game, 
-after the module I decided that I actually wanted to convert the prototype into an actual game
-that people can run on all platforms (Linux, Mac OSX and Windows).
+to demonstrate the game concepts of the design to the class. After completing the module
+I decided that I actually wanted to play this game on my system. (Visual Studio creates
+windows applications, and since I use Linux and Mac OSX the version created by Visual
+Studio was not suitable). Frog Game is now using Python as its platform and uses the
+pygame library (http://pygame.org). As a result Frog Game now has support on Windows,
+Linux and Mac OSX - and any other operating system where python and pygame are supported).
 
-You can find more information about the prototype version of Frog Game:
-    * http://saraclan.com/portfolio/project/Frogger
-    * http://git.saraclan.com/index.php?p=frogger.git
+The following links have more information about the prototype version of Frog Game:
+    * http://saraclan.com/portfolio/project/Frogger (My Portfolio - holding details of the project)
+    * http://git.saraclan.com/index.php?p=frogger.git (GIT repository of the prototype)
 
 Information about the current project can be found here:
     * https://launchpad.net/frogger
 
-Artwork:
-
-The artwork of frog game was created by Daniel Bell (C) 2009-2010.
-
-Game Code:
-
-The game code for Frog Game was written by Daniel Bell (C) 2009-2010.
-Frog Game is a python application and utilises the pygame library (http://pygame.org) - LGPLv2 licenced.
-Frog Game has been tested using Python 2.5.x and 2.6.x on Windows, 2.6.x on Linux and 2.5 and 2.6 on Mac OS X.
-
-Running the game:
-
-To run this game, you require a version of Python (http://python.org) of at least 2.5 or 2.6 (other versions may work,
-but are not supported.) and pygame (http://pygame.org) of 1.9.0 (older versions such as 1.7.1 or 1.8.0 may be work, but
-cannot be supported.)
-
-You can run this game via the command-line by running the following command: python frogger.py
-You can also right click the frogger.py script and open it with the Python Interpreter.
-
-There are intallers and binaries available at http://launchpad.net/frogger
-
-Game Licence:
-
-Frog Game is licenced under the GNU General Public Licence v3. More details can be found in the LICENCE file
-if you did not recieve a LICENCE file, you can find more information at the Free Software Foundations website:
-http://www.gnu.org/licenses/gpl-3.0.txt
-
-Game Dependencies:
-
-As mentioned above, the dependancies for Frog Game are: Python 2.5 or greater, and Pygame 1.9.1.
-Python can be found at: http://python.org
-Pygame can be found at: http://pygame.org
+GAME OBJECTIVES:
+The objectives of Frog Game are to rescue the lost baby frogs and to get them home safe!
+
+As a player you control the Big Frog and it is your job to collect the frogs one at a time
+and bring them back to the start. Avoiding the obstacles and hazards on the way is essential
+for maximum point scoring as when you die the frog you were rescuing dies also.
+
+The scoring system takes into account how fast it took you to rescue the baby frog and
+your past deaths (if any).
+
+A new level begins when there are no baby frogs left to save and you have at least 1 life still
+remaining.
+
+ARTWORK:
+The artwork of frog game was created by Daniel Bell Copyright (C) 2009, 2010.
+
+RUNNING FROM SOURCE:
+Frog Game has the following dependencies:
+	* Python - 2.5+ (Tested it on 2.5 and 2.6 - lower versions may be supported)
+	* Pygame library - 1.9+ (Tested it on 1.9.1 - lower versions may be supported)
+
+On Windows:
+	Right click frogger.py and select "open with Python Interpreter".
+	Double clicking may automatically run the game code.
+On Mac:
+	Right click and in the Open With menu select Python Launcher
+On Linux: 
+	Using the terminal navigate to the folder containing the source code and run
+		this command: "python frogger.py"
+
+There are installers and binaries available at http://launchpad.net/frogger
+
+LICENSE:
+Frog Game is licensed under the GNU General Public License v3. More details can be found
+in the LICENSE file. If you did not receive a LICENSE file, you can find more information
+at the Free Software Foundations website: http://www.gnu.org/licenses/gpl-3.0.txt
+
+CONTRIBUTING:
+You can help the project in many ways through either submitting art, feature requests, fixing bugs
+and so on. Please see our launchpad project page: https://launchpad.net/frogger and contact
[e-mail]
+
+SUPPORT:
+If you come across any issues or abnormalities with Frog Game support is available on our
+launchpad page: https://launchpad.net/frogger on our launchpad page you can file bugs and 
+ask questions. 
+
+Please don't hesitate to report bugs or ask questions on even the most trivial of issues.
 
=== removed file 'Frogger/data/fonts/bgrovealtb.ttf'
 Binary files Frogger/data/fonts/bgrovealtb.ttf	2010-01-25 14:59:15 +0000 and Frogger/data/fonts/bgrovealtb.ttf	1970-01-01 00:00:00 +0000 differ
=== added file 'Frogger/data/fonts/nibby.ttf'
 Binary files Frogger/data/fonts/nibby.ttf	1970-01-01 00:00:00 +0000 and Frogger/data/fonts/nibby.ttf	2010-03-12 10:44:17 +0000 differ
=== added file 'Frogger/data/frog-game.desktop'
--- Frogger/data/frog-game.desktop	1970-01-01 00:00:00 +0000
+++ Frogger/data/frog-game.desktop	2010-03-12 10:44:17 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Name=Frog Game
+Comment=Fun survival/rescue game!
+Exec=frogger
+Icon=frog-game
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;
 
=== added directory 'Frogger/data/icons'
=== added directory 'Frogger/data/icons/16x16'
=== added file 'Frogger/data/icons/16x16/frog-game.png'
 Binary files Frogger/data/icons/16x16/frog-game.png	1970-01-01 00:00:00 +0000 and Frogger/data/icons/16x16/frog-game.png	2010-03-12 10:44:17 +0000 differ
=== added directory 'Frogger/data/icons/22x22'
=== added file 'Frogger/data/icons/22x22/frog-game.png'
 Binary files Frogger/data/icons/22x22/frog-game.png	1970-01-01 00:00:00 +0000 and Frogger/data/icons/22x22/frog-game.png	2010-03-12 10:44:17 +0000 differ
=== added directory 'Frogger/data/icons/24x24'
=== added file 'Frogger/data/icons/24x24/frog-game.png'
 Binary files Frogger/data/icons/24x24/frog-game.png	1970-01-01 00:00:00 +0000 and Frogger/data/icons/24x24/frog-game.png	2010-03-12 10:44:17 +0000 differ
=== added directory 'Frogger/data/icons/48x48'
=== added file 'Frogger/data/icons/48x48/frog-game.png'
 Binary files Frogger/data/icons/48x48/frog-game.png	1970-01-01 00:00:00 +0000 and Frogger/data/icons/48x48/frog-game.png	2010-03-12 10:44:17 +0000 differ
=== added file 'Frogger/data/icons/frog-game.icns'
 Binary files Frogger/data/icons/frog-game.icns	1970-01-01 00:00:00 +0000 and Frogger/data/icons/frog-game.icns	2010-03-12 10:44:17 +0000 differ
=== added file 'Frogger/data/icons/frog-game.ico'
 Binary files Frogger/data/icons/frog-game.ico	1970-01-01 00:00:00 +0000 and Frogger/data/icons/frog-game.ico	2010-03-12 10:44:17 +0000 differ
=== added directory 'Frogger/data/icons/scalable'
=== added file 'Frogger/data/icons/scalable/frog-game.svg'
--- Frogger/data/icons/scalable/frog-game.svg	1970-01-01 00:00:00 +0000
+++ Frogger/data/icons/scalable/frog-game.svg	2010-03-12 10:44:17 +0000
@@ -0,0 +1,68 @@
+<?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: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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   width="20"
+   height="17"
+   sodipodi:docname="life.gif">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="487"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="13.882353"
+     inkscape:cx="10"
+     inkscape:cy="8.5"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <image
+     xlink:href="file:///home/dbell/Documents/frog-game-0.2.0/life.gif"
+     width="20"
+     height="17"
+     id="image12"
+     x="0"
+     y="0" />
+</svg>
 
=== modified file 'Frogger/data/images/background.png' (properties changed: +x to -x)
 Binary files Frogger/data/images/background.png	2010-01-27 18:36:42 +0000 and Frogger/data/images/background.png	2010-03-12 10:44:17 +0000 differ
=== modified file 'Frogger/data/images/betterfrog.gif'
 Binary files Frogger/data/images/betterfrog.gif	2010-01-28 16:09:09 +0000 and Frogger/data/images/betterfrog.gif	2010-03-12 10:44:17 +0000 differ
=== added file 'Frogger/data/images/frogcarry.gif'
 Binary files Frogger/data/images/frogcarry.gif	1970-01-01 00:00:00 +0000 and Frogger/data/images/frogcarry.gif	2010-03-12 10:44:17 +0000 differ
=== modified file 'Frogger/data/images/log.gif'
 Binary files Frogger/data/images/log.gif	2010-01-28 16:09:09 +0000 and Frogger/data/images/log.gif	2010-03-12 10:44:17 +0000 differ
=== added file 'Frogger/frogger'
--- Frogger/frogger	1970-01-01 00:00:00 +0000
+++ Frogger/frogger	2010-03-12 10:44:17 +0000
@@ -0,0 +1,561 @@
+#!/usr/bin/env python
+
+###BEGIN LICENSE
+# Copyright (C) 2010 Daniel Bell <[e-mail]>
+# 
+#This program is free software: you can redistribute it and/or modify it      
+#under the terms of the GNU General Public License version 3, as published
+#by the Free Software Foundation.   
+#   
+#This program is distributed in the hope that it will be useful, but       
+#WITHOUT ANY WARRANTY; without even the implied warranties of   
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR  
+#PURPOSE.  See the GNU General Public License for more details.     
+#   
+#You should have received a copy of the GNU General Public License along
+#with this program.  If not, see <http://www.gnu.org/licenses/>.  
+### END LICENSE
+
+import os
+import pygame
+from pygame.locals import *
+import sys
+import time
+
+from lib.sprites import (Leftcar, Rightcar, Homefrog, Log, Life, Frog)
+from lib.engine import *
+    
+#Declare global variables:   
+global screen
+global resolution #,display_flag, color_depth
+global caption, logo
+global clock
+global level, speed
+global font
+
+resolution = (800,600)
+#display_flag = DOUBLEBUF
+#color_depth = 32
+caption = "Frog Game"
+logo = "data/images/life.gif"
+
+clock = pygame.time.Clock()
+
+level = 1
+
+#Travel speed - logs and cars.
+#Unit is pixels? Remember game runs at 30 fps, so each second unit travels speed*30
+speed = 4
+
+#Initialize pygame, and setup the screen, captions and logo.
+#TODO: Find out if logo actually works in binaries. 
+pygame.init()
+pygame.display.set_caption(caption)
+pygame.display.set_icon(pygame.image.load(logo))
+#No longer specifying flag and depth, not required
+#and could restrict the portability of the game by limiting devices.
+screen = pygame.display.set_mode(resolution)
+
+def main():
+    """Main function - handles logic to act out the game.
+    Calls menu() to display the game menu
+    """
+    #Call menu() to display menu to allow game to be played.
+    menu()
+
+def instructions():
+    """ Instruction Screen: call this when you want to display how to play the game
+    """
+    screen = pygame.display.set_mode(resolution) 
+
+    #Print text to the screen.
+    font_write("INSTRUCTIONS", 72, True, (0, 0, 255), 0, (150, 100), screen)
+
+    font_write("The objectives of Frog Game are to rescue the lost baby frogs and to get them home safe!", 14, True, (0, 0, 255), 0, (80, 180), screen)
+
+    font_write("As a player you control the Big Frog and it is your job to collect", 18, True, (0, 0, 255), 0, (110, 220), screen)
+    font_write("the frogs one at a time and bring them back to the start. Avoiding", 18, True, (0, 0, 255), 0, (110, 240), screen)
+    font_write("the obstacles and hazards on the way is essential for maximum point", 18, True, (0, 0, 255), 0, (110, 260), screen)
+    font_write("scoring as when you die the frog you were rescuing dies also.", 18, True, (0, 0, 255), 0, (110, 280), screen)
+
+    font_write("The scoring system takes into account how fast it took you to", 18, True, (0, 0, 255), 0, (110, 320), screen)
+    font_write("rescue the baby frog and your past deaths (if any).", 18, True, (0, 0, 255), 0, (110, 340), screen)
+
+    font_write("A new level begins when there are no baby frogs left to save", 18, True, (0, 0, 255), 0, (110, 380), screen)
+    font_write("and you have at least 1 life still remaining.", 18, True, (0, 0, 255), 0, (110, 400), screen)
+
+    font_write("Press <SPACE> to return to Menu", 24, True, (0, 0, 255), 0, (200, 500), screen)
+    font_write("ESC to exit", 18, True, (0, 0, 255), 0, (0, 0), screen)
+    
+    pygame.display.flip() #update display - just once not in loop.
+    #Main loop:    
+    while 1:
+        #Were looking for certain events only within the game over menu.
+        #ESC or mouse-clicking the 'X' to exit the game
+        #SPACEBAR to start a new game.
+        for event in pygame.event.get():
+            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
+                sys.exit()
+            if event.type == KEYDOWN and event.key == K_SPACE:
+               menu()
+        
+        #We need to ensure game is limited to 30FPS in order to control CPU
+        clock.tick(30)
+
+def game_over_screen(score):
+    """ This method is called when you wish to display the Game Over Screen.
+    Clears the screen and prints data about the past game: score, level
+    and a way to exit or start a new game.
+    
+    :param score: The score the player achieved before Game Over.
+    :type score: ``int``
+    :param level: The level the player achieved.
+    :type level: ``int``
+    """
+    
+    #Clear the screen so that it can be printed on.
+    screen = pygame.display.set_mode(resolution) 
+    
+    #Print text to the screen.
+    font_write("GAME OVER", 72, True, (0, 0, 255), 0, (210, 100), screen)
+    font_write("You Scored " + str(score) + " points!", 28, True, (0, 0, 255), 0, (230, 180), screen)
+    font_write("Highest level achieved: " + str(level), 28, True, (0, 0, 255), 0, (230, 210), screen)
+    font_write("Press <SPACE> to Start a New Game", 24, True, (0, 0, 255), 0, (200, 500), screen)
+    font_write("ESC to exit", 18, True, (0, 0, 255), 0, (0, 0), screen)
+    
+    pygame.display.flip() #update display - just once not in loop.
+    #Main loop:    
+    while 1:
+        #Were looking for certain events only within the game over menu.
+        #ESC or mouse-clicking the 'X' to exit the game
+        #SPACEBAR to start a new game.
+        for event in pygame.event.get():
+            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
+                sys.exit()
+            if event.type == KEYDOWN and event.key == K_SPACE:
+                game()
+        
+        #We need to ensure game is limited to 30FPS in order to control CPU
+        clock.tick(30)  
+        
+def menu():
+    """ This method is called when you wish to display the STARTUP menu.
+    This menu is the entry point to the game, it contains logic that 
+    allows the player to play the game, exit (and so on).
+    """
+    #Clear screen.
+    screen = pygame.display.set_mode(resolution) 
+    
+    #Print text to screen.
+    font_write("FROG GAME", 72, True, (0, 0, 255), 0, (210, 200), screen)
+    font_write("Welcome To", 32, True, (0, 0, 255), 0, (305, 175), screen)
+    font_write("Press <I> for Instructions", 24, True, (0, 0, 255), 0, (240, 480), screen)
+    font_write("Press <SPACE> to Continue", 24, True, (0, 0, 255), 0, (247, 500), screen)
+    font_write("ESC to exit", 18, True, (0, 0, 255), 0, (0, 0), screen)
+
+    pygame.display.flip()
+    #Main loop:
+    while 1:
+        for event in pygame.event.get():
+            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
+                sys.exit()
+            if event.type == KEYDOWN and event.key == K_SPACE:
+                game()
+            if event.type ==KEYDOWN and event.key == K_i:
+                instructions()
+                
+        clock.tick(30)  
+        
+def game():
+    #starting game needs to be on level 1.
+    global level, speed
+    level =1
+    speed = 4
+    """ This method contains all the logic for the actual game.
+    This is to be called when the player wants to play the game.
+    """
+    #Clear screen.
+    screen = pygame.display.set_mode(resolution) 
+
+    #Setup the background.
+    backgroundImage = 'data/images/background.png'
+    background = pygame.image.load(backgroundImage).convert()
+    screen.blit(background, (0,0))
+    pygame.display.update()
+
+    #Create player character.
+    player = Frog()
+    
+    #Create the cars that travel in the left direction.
+    leftcars = [
+            Leftcar(0,   285),
+            Leftcar(280, 285),
+            Leftcar(560, 285),        
+            Leftcar(100, 375), 
+            Leftcar(380, 375),
+            Leftcar(660, 375),
+            ]
+    #Create the cars that travel right direction.
+    rightcars = [
+            Rightcar(200, 330),
+            Rightcar(480, 330),
+            Rightcar(760, 330),
+            Rightcar(60,  420),
+            Rightcar(300, 420),
+            Rightcar(580, 420),
+            ]
+    #Create babyfrogs
+    babyfrogs = [
+            Homefrog(30, 15),
+            Homefrog(258,15),
+            Homefrog(482,15),
+            Homefrog(720,15),
+            ]
+    #Create logs that travel left.
+    leftlogs = [
+            Log(0,   60),
+            Log(234, 60),
+            Log(468, 60),
+            Log(702, 60),
+            Log(0,   150),
+            Log(234, 150),
+            Log(468, 150),
+            Log(702, 150),
+            ]
+    #Create logs that travel right.
+    rightlogs = [
+            Log(0,   105),
+            Log(234, 105),
+            Log(468, 105),
+            Log(702, 105),
+            Log(0,   195),
+            Log(234, 195),
+            Log(468, 195),
+            Log(702, 195),            
+            ]
+    #Create life images.
+    lives = [
+            Life(10, 570),
+            Life(38, 570),
+            Life(66, 570),
+            ] 
+
+    #Create sprite group - all.
+    #Using pygame.sprite.OirderedUpdates instead of RenderedUpdates
+    #There is a small performance decrease for using this, but required
+    #to allow frogs to be on top of logs.
+    all = pygame.sprite.OrderedUpdates(
+        leftlogs, rightlogs, player, leftcars, rightcars, babyfrogs, lives) 
+    
+    #Print level, and score/information on screen.
+    font_write("Level: " +str(level) + "    ", 34, True, (0, 0, 255), (0, 0, 0), (3, 510), screen)
+    print_score_data(player.score, player.perfect_score, player.good_score)
+    
+    pygame.key.set_repeat(100)
+    #Main loop: (GAME LOOP).
+    while 1:
+
+        #Get input
+        for event in pygame.event.get():
+            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
+                sys.exit()
+            #Only allow player movement if game is not over - not tech required:
+            #as when its game over a new screen is displayed.
+            #For each movement - reset on_left_log and on_right_log to False
+            #so that there is never a way you could have some ghost movement of the player.
+            if player.game_over != True:
+                if event.type == KEYDOWN and event.key == K_UP:
+                    player.rect.top -= 45
+                    player.on_left_log = False
+                    player.on_right_log = False
+                    for frog in babyfrogs:
+                        if frog.rect.colliderect(player.rect) and player.collecting ==True:
+                            player.rect.top +=45
+                if event.type == KEYDOWN and event.key == K_DOWN:
+                    player.rect.top += 45
+                    player.on_left_log = False
+                    player.on_right_log = False
+                    for frog in babyfrogs:
+                        if frog.rect.colliderect(player.rect) and player.collecting ==True:
+                            player.rect.top -=45
+                if event.type == KEYDOWN and event.key == K_LEFT:
+                    player.rect.left -= 20 
+                    player.on_left_log = False
+                    player.on_right_log = False
+                    for frog in babyfrogs:
+                        if frog.rect.colliderect(player.rect) and player.collecting ==True:
+                            player.rect.left +=20
+                if event.type == KEYDOWN and event.key == K_RIGHT:
+                    player.rect.left += 20
+                    player.on_left_log = False
+                    player.on_right_log = False
+                    for frog in babyfrogs:
+                        if frog.rect.colliderect(player.rect) and player.collecting ==True:
+                            player.rect.left -=20
+        
+        #move objects      
+        
+        #Move the left cars:    
+        for car in leftcars:
+            if car.rect.right <=0:
+                car.rect.left = 800
+            else:
+                car.rect.left -= speed
+            #Die if they collide
+            if car.rect.colliderect(player.rect):
+                player_died(player, babyfrogs)
+                print_score_data(player.score, player.perfect_score, player.good_score)           
+
+        #Move the right cars:
+        for car in rightcars:
+            if car.rect.left >=800:
+                car.rect.right = 0
+            else:
+                car.rect.left += speed
+            #player dies if they collide
+            if car.rect.colliderect(player.rect):
+                player_died(player, babyfrogs)
+                print_score_data(player.score, player.perfect_score, player.good_score)
+        
+        #Move the left logs:
+        for log in leftlogs:
+            if log.rect.right <=0:
+                log.rect.left = 800
+            else:
+                log.rect.left -=speed
+            #if log collides, set player variable on_left_log to True.
+            if log.rect.colliderect(player.rect):
+                player.on_left_log = True
+        
+        #Move the right logs:
+        for log in rightlogs:
+            if log.rect.left >=800:
+                log.rect.right = 0
+            else:
+                log.rect.left +=speed
+            #If right logs collides with frog, set player variable on_right_log to True.
+            if log.rect.colliderect(player.rect):
+                player.on_right_log = True
+        
+        #Check if the player picks up a frog:
+        #Set player variables: collecting to True, and collecting_number to babyfrog picked up.
+        #Hide the frog from view.
+        for frog in range(len(babyfrogs)):
+            if babyfrogs[frog].rect.colliderect(player.rect):
+                if player.collecting == False:
+                    player.collecting = True
+                    player.collecting_number = frog
+                    babyfrogs[frog].collected = True
+                    babyfrogs[frog].rect.left = -100
+                    babyfrogs[frog].rect.top = -100
+                    player.carry_frog(player.rect.left, player.rect.top)
+        
+        #Water Area: if the frog is in between these positions
+        #the frog must be on a log to survive.
+        #if frog is on a log, then the system needs to automate the movement.
+        if player.rect.top <=195 and player.rect.top >=40:
+            if player.on_left_log == True:
+                player.rect.left -=speed
+            elif player.on_right_log == True:
+                player.rect.left +=speed
+            #Not on a log: die and update.
+            else:
+                player_died(player, babyfrogs)
+                print_score_data(player.score, player.perfect_score, player.good_score)
+        
+        #When its game over - display a game over screen.
+        if player.game_over:
+            game_over_screen(player.score)
+        
+        #Handle the positioning of life icons.
+        if player.lives == 2:
+            lives[2].rect.left = -50
+        if player.lives == 1:
+            lives[1].rect.left = -50
+        
+        #If all babyfrogs are saved, then start a new level :)
+        if babyfrogs[0].saved == True:
+            if babyfrogs[1].saved == True:
+                if babyfrogs[2].saved == True:
+                    if babyfrogs[3].saved == True:
+                        new_level(player, babyfrogs, lives)
+
+                   
+        #Clear sprite
+        all.clear(screen, background)
+
+        #Update sprites
+        all.update()
+        player_boundaries(player, babyfrogs)
+
+        #Redraw sprites
+        all.draw(screen)
+        pygame.display.flip()
+
+        #Maintain frame rate
+        #using 30 FPS
+        clock.tick(30)                   
+
+def print_score_data(score, perfect, good, time=None):
+    """This method is used to print Score details to the screen.
+    It prints score and the current score modifier.
+    :param score: The players score
+    :param type: ``int``
+    :param perfect: value of players perfectScore
+    :param type: ``boolean``
+    :param good: value of players goodScore
+    :param type: ``boolean``
+    :param time: time taken to score
+    :param type: ``int``
+    """
+    #Print to screen. 
+    font_write("Score: " +str(score) + "   ", 28, True, (0, 0, 255), (0, 0, 0), (3, 540), screen)
+    if perfect:
+        font_write("Score Modifier: x3   ", 28, True, (0, 0, 255), (0, 0, 0), (535, 510), screen)
+    elif good:
+        font_write("Score Modifier: x2   ", 28, True, (0, 0, 255), (0, 0, 0), (535, 510), screen)
+    else:
+        font_write("Score Modifier: x1   ", 28, True, (0, 0, 255), (0, 0, 0), (535, 510), screen)
+    if time!=None:
+            font_write(
+                    "Last Frog saved in: " +str(time) + " seconds!     ", 28, True, (0, 0, 255),
+                    (0, 0, 0), (380, 550), screen)
+    
+def player_died(player, babyfrogs):
+    """This method should be called if when the player died and acts out everything that is
+    required to happen when a player dies: loosing of lives, ensuring babyfrog goes back correctly
+    and so on.
+    :param player: The player
+    :param type: ``Frog`` - send through an instance of Frog Class.
+    :param babyfrogs: The babyfrogs
+    :param type: ``Homefrog`` - send through an instance of Homefrog Class.
+    """
+    #Reset timer
+    player.startTime = time.time()
+    #if we die, then the frog we hold needs to be reset.
+    babyfrog_reset(babyfrogs, player.collecting_number)
+    #Reset some player variables.
+    player.good_score = False
+    player.perfect_score = False
+    player.on_left_log = False
+    player.on_right_log = False
+    player.collecting = False
+    player.collecting_number = None
+    player.not_carry_frog(player.rect.left, player.rect.top)
+    #Reset player position.
+    player.rect.left = player.starting_left
+    player.rect.top = player.starting_top
+    #Remove one from life.
+    player.lives -= 1
+    if player.lives <= 0:
+        player.game_over = True
+
+def player_boundaries(player, babyfrogs):
+    """This method should be called when you want to ensure frog is within boundaries
+    :param player: The player.
+    :param type: ``Frog`` - send through an instance of Frog Class
+    :param babyfrogs: The babyfrogs.
+    :param type: ``Homefrog`` - send through an instance of Homefrog Class
+    """
+    #If not on any logs:
+    if player.on_left_log != True and player.on_right_log != True:
+        if player.rect.top >=510:
+            player.rect.top -=45
+        if player.rect.top <=0:
+            player.rect.top +=45
+        if player.rect.left <=0:
+            player.rect.left +=20
+        if player.rect.right >=800:
+            player.rect.left -=20
+        #this is home spot - so check if we should score.
+        if player.rect.top ==465:
+            player_scored(player, babyfrogs)
+    #If were on a log boundaries and handled differently.
+    else:
+        if player.rect.right <=0:
+            player_died(player, babyfrogs)
+        if player.rect.left >=800:
+            player_died(player, babyfrogs)
+
+def babyfrog_reset(babyfrog, collecting_number):
+    """ This method should be called when you want to reset the position of the babyfrog specified
+    it sets the saved variable of a babyfrog in the list to true, the frog that is reset depends
+    on what is send through.
+    :param babyfrogs: The babyfrogs.
+    :param type: ``Homefrog`` - send through an instance of Homefrog Class
+    :param collecting_number: The babyfrog you want to reset.
+    :param type: ``int``
+    """
+    #Make sure the frog we are trying to reset has a number (error prevention)
+    #Use the default left, top that were assigned on creation to reset position
+    if collecting_number!=None:
+        #babyfrog[collecting_number].rect.left = babyfrog[collecting_number].left
+        #babyfrog[collecting_number].rect.top = babyfrog[collecting_number].top
+        #now just sets saved to true, so frog can no longer be captured.It dies with big frog.
+        babyfrog[collecting_number].saved = True
+def player_scored(player, babyfrogs):
+    """ This method should be called when the player has scored.
+    It acts out things required when a player scores.
+    :param player: The player.
+    :param type: ``Frog`` - send through an instance of Frog Class
+    :param babyfrogs: The babyfrogs.
+    :param type: ``Homefrog`` - send through an instance of Homefrog Class
+    """
+    #Since we can start at the scoring position, we only want to act out this
+    #if we are collecting a frog, (and as error prevention so we cannot attempt to score when
+    #list is "None" make sure there is a value in collecting_number.
+    #Reset player variables: collecting, collecting_number
+    #Set babyfrogs variables: saved - True (we've just saved frog)
+    #Add score and print.
+    if player.collecting == True and player.collecting_number !=None:
+        player.collecting = False
+        babyfrogs[player.collecting_number].saved = True
+        babyfrogs[player.collecting_number].collected = False
+        player.collecting_number = None
+        player.not_carry_frog(player.rect.left, player.rect.top)
+        player.add_score()
+        print_score_data(player.score, player.perfect_score, player.good_score, player.end_time)
+
+def new_level(player, babyfrogs, lives):
+    """ This method should be called when you want a new level to begin.
+    It resets the game so that a new level can begin - and then increments level and speed.
+    :param player: The player
+    :param type: ``Frog`` - send through an instance of Frog Class.
+    :param babyfrogs: The babyfrogs
+    :param type: ``Homefrog`` - send through an instance of Homefrog Class.
+    """
+    global level, speed
+    level +=1 #add 1 to level
+    speed +=1 #add 1 to speed
+    #Reset position of frog.
+    player.rect.left = player.starting_left
+    player.rect.top = player.starting_top
+    #Reset position of babyfrogs, and reset collected, saved variables.
+    for frog in babyfrogs:
+        frog.collected = False
+        frog.saved = False
+        frog.rect.left = frog.left
+        frog.rect.top = frog.top
+    #Before we add lives check if we have 3: Remember if you have three lives when you complete
+    #a level you get a good_score = true.
+    if player.lives ==3:
+        player.good_score = True
+    else:
+        player_add_life(player, lives)
+        #reprint stuff to screen.
+    font_write("Level: " +str(level) + "    ", 34, True, (0, 0, 255), (0, 0, 0), (3, 510), screen)
+    print_score_data(player.score, player.perfect_score, player.good_score, player.end_time)
+
+def player_add_life(player, lives):
+    """ This method to be called when you wish to add a life to the player.
+    Handles the life images and so forth.
+    """
+    #revalidates that player doesn't already have 3 lifes: 3 is max. 
+    if player.lives <3:
+        player.lives +=1
+        if player.lives==3:
+            lives[2].rect.left = 68
+        if player.lives==2:
+            lives[1].rect.left = 38
+
+if __name__ == '__main__': main()
 
=== removed file 'Frogger/frogger.py'
--- Frogger/frogger.py	2010-02-09 19:44:03 +0000
+++ Frogger/frogger.py	1970-01-01 00:00:00 +0000
@@ -1,356 +0,0 @@
-#!/usr/bin/env python
-"""
-Frog Game (C) Daniel Bell, 2010.
-Frog Game is released under the General Public License Version 3. See LICENSE for details.
-Frog Game is a fun survival game, that is based upon the classic arcade game: Frogger.
-"""
-try:
-    import sys
-    import os
-    import pygame
-    import time
-    from pygame.locals import *
-    from sprites import *
-except ImportError, err:
-    print "Failure loading module. %s" % (err)
-    sys.exit(2)
-    
-"""
-Image Loading Function
-"""
-global screen
-screen = pygame.display.set_mode((592,774), DOUBLEBUF, 32)
-
-def levelIndicator(level):
-    fontNormal = pygame.font.Font('data/fonts/bgrovealtb.ttf', 28)
-    levelText = fontNormal.render("Level: " + str(level), True, (0, 0, 255), (181, 230, 29))
-    screen.blit(levelText, (250, 15))
-    pygame.display.update()
-
-def scoreIndicator(score, time, perfect, good):
-    fontNormal = pygame.font.Font('data/fonts/bgrovealtb.ttf', 18)
-    scoreText = fontNormal.render("Score: " + str(score), True, (0, 0, 255), (0, 0, 0))
-    if time != 0:
-        scoreTime = fontNormal.render("Last Frog Scored in: " + str(time) + " seconds!", True, (0, 0, 255), (0, 0, 0))
-        screen.blit(scoreTime, (300, 745))
-
-    if perfect == True:
-        modifier = fontNormal.render("Score Modifier: (x3)", True, (0, 0, 255), (0, 0, 0))
-        screen.blit(modifier, (422, 715))
-
-    elif good == True and perfect == False:
-        modifier = fontNormal.render("Score Modifier: (x2)", True, (0, 0, 255), (0, 0, 0))
-        screen.blit(modifier, (422, 715))  
-
-    else:
-        modifier = fontNormal.render("Score Modifier: (x1)", True, (0, 0, 255), (0, 0, 0))
-        screen.blit(modifier, (422, 715)) 
-              
-    screen.blit(scoreText, (5, 745))
-    pygame.display.update()    
-
-def gameOverScreen(score, level):
-    pygame.init()
-    pygame.display.set_caption('Frog Game')
-    logo = pygame.image.load("data/images/logo.png")
-    pygame.display.set_icon(logo)
-
-    screen = pygame.display.set_mode((592,774), DOUBLEBUF, 32)
-
-    pygame.display.update()
-
-    """
-    Menu
-    """
-    fontTitle = pygame.font.Font('data/fonts/bgrovealtb.ttf', 72)
-    fontNormal = pygame.font.Font('data/fonts/bgrovealtb.ttf', 28)
-    fontExit = pygame.font.Font('data/fonts/bgrovealtb.ttf', 18)
-   
-    title = fontTitle.render("GAME OVER", True, (0, 0, 255))
-    caption = fontNormal.render("You Scored: " + str(score), True, (0, 0, 255))
-    caption2 = fontNormal.render("Level: " + str(level), True, (0, 0, 255))
-    play = fontNormal.render("Press <SPACE> to Start a New Game", True, (0, 0, 255))
-    esc = fontExit.render("ESC to exit", True, (0, 0, 255))     
-
-    screen.blit(caption, (150, 160))
-    screen.blit(caption2, (150, 200))
-    screen.blit(title, (100,50))
-    screen.blit(esc, (0, 0))
-    screen.blit(play, (60, 700))
-    pygame.display.update()
-    clock = pygame.time.Clock()   
-    while 1:
-
-        #Get input
-        for event in pygame.event.get():
-            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
-                sys.exit()
-            if event.type == KEYDOWN and event.key == K_SPACE:
-                game()
-        #using 30 FPS
-        clock.tick(30)  
-def main():
-    pygame.init()
-    pygame.display.set_caption('Frog Game')
-    logo = pygame.image.load("data/images/logo.png")
-    pygame.display.set_icon(logo)
-
-    screen = pygame.display.set_mode((592,774), DOUBLEBUF, 32)
-
-    pygame.display.update()
-
-    """
-    Menu
-    """
-    fontTitle = pygame.font.Font('data/fonts/bgrovealtb.ttf', 72)
-    fontNormal = pygame.font.Font('data/fonts/bgrovealtb.ttf', 28)
-    fontExit = pygame.font.Font('data/fonts/bgrovealtb.ttf', 18)
-   
-    title = fontTitle.render("FROG GAME", True, (0, 0, 255))
-    caption = fontNormal.render("Welcome To", True, (0, 0, 255))
-    play = fontNormal.render("Press <SPACE> to Continue", True, (0, 0, 255))
-    esc = fontExit.render("ESC to exit", True, (0, 0, 255))     
-
-    screen.blit(caption, (220, 175))
-    screen.blit(title, (100,200))
-    screen.blit(esc, (0, 0))
-    screen.blit(play, (120, 700))
-    pygame.display.update()
-
-    clock = pygame.time.Clock()    
-    while 1:
-
-        #Get input
-        for event in pygame.event.get():
-            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
-                sys.exit()
-            if event.type == KEYDOWN and event.key == K_SPACE:
-                game()
-        #using 30 FPS
-        clock.tick(30)  
-def game():
-    
-    #Initialise pygame, icons and captions.
-    pygame.init()
-    pygame.display.set_caption('Frog Game')
-    logo = pygame.image.load("data/images/logo.png")
-    pygame.display.set_icon(logo)
-
-    #Initialise the screen, resolution: 592x774 (which is the size of the current background).
-        #TODO: Make the screen size smaller by default, or allow scrolling to occur in the game.
-
-    screen = pygame.display.set_mode((592,774), DOUBLEBUF, 32)
-    
-    #Make background
-    backgroundImage = 'data/images/background.png'
-    background = pygame.image.load(backgroundImage).convert()
-    screen.blit(background, (0,0))
-    pygame.display.update()
-
-
-    #Keep track of sprites
-    player = Frog()
-    leftcars = []
-    """
-    0 & 1 = Row 1, 2 & 3 = Row 3, 4 & 5 = Row 5
-    """
-    leftcars.append(Leftcar(400, 616)) # 0
-    leftcars.append(Leftcar(100, 616)) # 1
-    leftcars.append(Leftcar(400, 526)) # 2
-    leftcars.append(Leftcar(100, 526)) # 3
-    leftcars.append(Leftcar(400, 436)) # 4
-    leftcars.append(Leftcar(100, 436)) # 5
-
-    rightcars = []
-    """
-    0 & 1 = Row 1, 2 & 3 = Row 3, 4 & 5 = Row 5
-    """
-    rightcars.append(Rightcar(200, 571)) # 0
-    rightcars.append(Rightcar(500, 571)) # 1
-    rightcars.append(Rightcar(200, 481)) # 2
-    rightcars.append(Rightcar(500, 481)) # 3
-    rightcars.append(Rightcar(200, 391)) # 4
-    rightcars.append(Rightcar(500, 391)) # 5
-    
-    homefrogs = [Homefrog(-10,-10), Homefrog(-10,-10), Homefrog(-10,-10), Homefrog(-10,-10), Homefrog(-10,-10)]
-
-    leftlogs = [Log(20, 301), Log(220, 301), Log(420,301), Log(20, 211), Log(220, 211), Log(420, 211), Log(20, 121), Log(220, 121), Log(420, 121)]
-    rightlogs = [Log(-20, 256), Log(180, 256), Log(380, 256), Log(-20, 166), Log(180, 166), Log(380, 166)]
-    
-    lives = [Life(10, 710), Life(38, 710), Life(66, 710)]
-
-    speed = 4
-        
-    """
-    Using pygame.sprite.OrderedUpdates instead of pygame.sprite.RenderedUpdates due to the need to have the the frog ONTOP of the logs.
-    There is a small performance hit using this function.
-    """
-    all = pygame.sprite.OrderedUpdates(leftlogs, rightlogs, player, leftcars, rightcars, homefrogs, lives) 
-
-    #Keep track of time
-    clock = pygame.time.Clock()    
-
-    levelIndicator(player.level)
-    scoreIndicator(player.score, 0, player.perfectScore, player.goodScore)
-    #Game Loop
-    while 1:
-
-        #Get input
-        for event in pygame.event.get():
-            if event.type == QUIT or (event.type == KEYDOWN and event.key == K_ESCAPE):
-                sys.exit()
-            if player.gameOver != True:
-                if event.type == KEYDOWN and event.key == K_UP:
-                    player.rect.top -= 45
-                    player.onLeftLog = False
-                    player.onRightLog = False
-                if event.type == KEYDOWN and event.key == K_DOWN:
-                    player.rect.top += 45
-                    player.onLeftLog = False
-                    player.onRightLog = False 
-                if event.type == KEYDOWN and event.key == K_LEFT:
-                    player.rect.left -= 20 
-                    player.onLeftLog = False
-                    player.onRightLog = False
-                if event.type == KEYDOWN and event.key == K_RIGHT:
-                    player.rect.left += 20
-                    player.onLeftLog = False
-                    player.onRightLog = False
-        
-        #move objects          
-        for car in leftcars:
-            if car.rect.right <=0:
-                car.rect.left = 600
-            else:
-                car.rect.left -= speed
-            if car.rect.colliderect(player.rect):
-                player.loseLife()
-                scoreIndicator(player.score, 0, player.perfectScore, player.goodScore)             
-
-        for car in rightcars:
-            if car.rect.left >=600:
-                car.rect.right = 0
-            else:
-                car.rect.left += speed
-            if car.rect.colliderect(player.rect):
-                player.loseLife()
-                scoreIndicator(player.score, 0, player.perfectScore, player.goodScore)
-        
-        for log in leftlogs:
-            if log.rect.right <=0:
-                log.rect.left = 600
-            else:
-                log.rect.left -=speed
-            if log.rect.colliderect(player.rect):
-                player.onLeftLog = True
-
-        for log in rightlogs:
-            if log.rect.left >=600:
-                log.rect.right = 0
-            else:
-                log.rect.left +=speed
-            if log.rect.colliderect(player.rect):
-                player.onRightLog = True
-
-        if player.rect.top <=301 and player.rect.top >=121:
-            if player.onLeftLog == True:
-                player.rect.left -=speed
-            elif player.onRightLog == True:
-                player.rect.left +=speed
-            else:
-                player.loseLife()
-                scoreIndicator(player.score, 0, player.perfectScore, player.goodScore)
-
-        if player.rect.top <=100:
-
-            if player.rect.left >=12 and player.rect.right <=104 and player.frogsHome[0] != True:
-                player.scored()
-                scoreIndicator(player.score, player.endTime, player.perfectScore, player.goodScore)
-                homefrogs[0].rect.left = 35
-                homefrogs[0].rect.top = 70
-                player.frogsHome[0] = True
-
-            elif player.rect.left >=132 and player.rect.right <=224 and player.frogsHome[1] != True:
-                player.scored()
-                scoreIndicator(player.score, player.endTime, player.perfectScore, player.goodScore)
-                homefrogs[1].rect.left = 155
-                homefrogs[1].rect.top = 70
-                player.frogsHome[1] = True
-
-            elif player.rect.left >=252 and player.rect.right <=344 and player.frogsHome[2] != True:
-                player.scored()
-                scoreIndicator(player.score, player.endTime, player.perfectScore, player.goodScore)
-                homefrogs[2].rect.left = 275
-                homefrogs[2].rect.top = 70
-                player.frogsHome[2] = True
-
-            elif player.rect.left >=372 and player.rect.right <=464 and player.frogsHome[3] != True:
-                player.scored()
-                scoreIndicator(player.score, player.endTime, player.perfectScore, player.goodScore)
-                homefrogs[3].rect.left = 395
-                homefrogs[3].rect.top = 70
-                player.frogsHome[3] = True
-
-            elif player.rect.left >=492 and player.rect.right <=584 and player.frogsHome[4] != True:
-                player.scored()
-                scoreIndicator(player.score, player.endTime, player.perfectScore, player.goodScore)
-                homefrogs[4].rect.left = 515
-                homefrogs[4].rect.top = 70
-                player.frogsHome[4] = True
-
-            else:
-                player.loseLife()
-                scoreIndicator(player.score, 0, player.perfectScore, player.goodScore)
-
-        if player.frogsHome[0] == True and player.frogsHome[1] == True and player.frogsHome[2] == True and player.frogsHome[3] == True and player.frogsHome[4] == True:
-            player.frogsHome[0] = False
-            player.frogsHome[1] = False
-            player.frogsHome[2] = False
-            player.frogsHome[3] = False
-            player.frogsHome[4] = False
-            homefrogs[0].rect.left = -10
-            homefrogs[0].rect.top = -10
-            homefrogs[1].rect.left = -10
-            homefrogs[1].rect.top = -10
-            homefrogs[2].rect.left = -10
-            homefrogs[2].rect.top = -10
-            homefrogs[3].rect.left = -10
-            homefrogs[3].rect.top = -10
-            homefrogs[4].rect.left = -10
-            homefrogs[4].rect.top = -10
-            if player.lives == 3:
-                player.goodScore = True
-            if player.lives <3:
-                player.lives +=1
-                if player.lives == 2:
-                    lives[1].rect.left = 38
-                elif player.lives == 3:
-                    lives[2].rect.left = 66
-            player.level +=1
-            speed +=1
-            levelIndicator(player.level)
-            
-        if player.gameOver:
-            gameOverScreen(player.score, player.level)
-
-        if player.lives == 2:
-            lives[2].rect.left = -50
-        if player.lives == 1:
-            lives[1].rect.left = -50
-
-                   
-        #Clear sprite
-        all.clear(screen, background)
-
-        #Update sprites
-        all.update()
-
-        #Redraw sprites
-        dirty = all.draw(screen)
-        pygame.display.update(dirty)
-
-        #Maintain frame rate
-        #using 30 FPS
-        clock.tick(30)                   
-
-if __name__ == '__main__': main()
 
=== added directory 'Frogger/lib'
=== added file 'Frogger/lib/__init__.py'
=== added file 'Frogger/lib/engine.py'
--- Frogger/lib/engine.py	1970-01-01 00:00:00 +0000
+++ Frogger/lib/engine.py	2010-03-12 10:44:17 +0000
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+
+###BEGIN LICENSE
+# Copyright (C) 2010 Daniel Bell <[e-mail]>
+# 
+#This program is free software: you can redistribute it and/or modify it      
+#under the terms of the GNU General Public License version 3, as published
+#by the Free Software Foundation.   
+#   
+#This program is distributed in the hope that it will be useful, but       
+#WITHOUT ANY WARRANTY; without even the implied warranties of   
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR  
+#PURPOSE.  See the GNU General Public License for more details.     
+#   
+#You should have received a copy of the GNU General Public License along
+#with this program.  If not, see <http://www.gnu.org/licenses/>.  
+### END LICENSE
+
+	
+import os	
+import pygame	
+from pygame.locals import *
+
+global font
+global font_write
+
+def load_image(name, colorkey=None):
+    fullname = os.path.join('data/images/', name)
+    try:
+        image = pygame.image.load(fullname)
+    except pygame.error, message:
+        print 'Cannot load image:', fullname
+        raise SystemExit, message
+    image = image.convert()
+    if colorkey is not None:
+        if colorkey is -1:
+            colorkey = image.get_at((0,0))
+        image.set_colorkey(colorkey, RLEACCEL)
+    return image, image.get_rect()
+
+def font_write(message, size, aaliasing, color, background, coordinates, screen):
+    """ This Method is used to print messages to the screen.
+    You can call this method, and with parameters messages will be displayed on the screen.
+    
+    :param message: The message you wish to display on the screen.
+    :type message: ``String``
+    :param size: The size of font you wish to use.
+    :type size: ``int``
+    :param aaliasing: Whether or not anti-aliasing should be enabled.
+    :type aaliasing: ``boolean``
+    :param color: Color of the message
+    :type color: ``int`` - in format of (red, green, blue)
+    :param background: Color of background.
+    :type background: ``int`` - 0 results in transparent otherwise format (red, green, blue)
+    :param coordinates: Coordinates of where the message should be displayed.
+    :param type: ``int`` - format (x, y)
+    :param screen: The screen you wish to print on
+    :param type: ``pygame.display``
+    """
+    #Define font
+    font ='data/fonts/nibby.ttf'
+    font = pygame.font.Font(font, size)
+    #Check if background is defined or not.
+    if background==0:
+        print_message=font.render(message, aaliasing, color)
+    else:
+        print_message=font.render(message, aaliasing, color, background)
+    screen.blit(print_message, coordinates)
+    #pygame.display.update()
 
=== added file 'Frogger/lib/sprites.py'
--- Frogger/lib/sprites.py	1970-01-01 00:00:00 +0000
+++ Frogger/lib/sprites.py	2010-03-12 10:44:17 +0000
@@ -0,0 +1,136 @@
+#!/usr/bin/env python
+
+###BEGIN LICENSE
+# Copyright (C) 2010 Daniel Bell <[e-mail]>
+# 
+#This program is free software: you can redistribute it and/or modify it      
+#under the terms of the GNU General Public License version 3, as published
+#by the Free Software Foundation.   
+#   
+#This program is distributed in the hope that it will be useful, but       
+#WITHOUT ANY WARRANTY; without even the implied warranties of   
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR  
+#PURPOSE.  See the GNU General Public License for more details.     
+#   
+#You should have received a copy of the GNU General Public License along
+#with this program.  If not, see <http://www.gnu.org/licenses/>.  
+### END LICENSE
+
+#Sprite module: Contains all the sprites/objects.
+
+	
+import sys	
+import os	
+import pygame	
+import time
+	
+from pygame.locals import *
+from lib.engine import *
+
+class Leftcar(pygame.sprite.Sprite):
+    """ This is the Leftcar class - contains logic required for
+    anything related to the leftcar.
+    Leftcar is a subclass of pygame.sprite.Sprite
+    """
+    def __init__(self, left, top):
+        pygame.sprite.Sprite.__init__(self)
+        self.image, self.rect = load_image('bettercar2.gif', -1)
+        self.rect.left = left
+        self.rect.top = top
+        
+class Rightcar(pygame.sprite.Sprite):
+    """ This is the Rightcar class - contains logic required for
+    anything related to the Rightcar.
+    Rightcar is a subclass of pygame.sprite.Sprite
+    """
+    def __init__(self, left, top):
+        pygame.sprite.Sprite.__init__(self)
+        self.image, self.rect = load_image('bettercar.gif', -1)
+        self.rect.left = left
+        self.rect.top = top   
+
+class Homefrog(pygame.sprite.Sprite):
+    def __init__(self, left, top):
+        self.left = left
+        self.top = top
+        pygame.sprite.Sprite.__init__(self)
+        self.image, self.rect = load_image('life.gif')
+        self.rect.left = self.left
+        self.rect.top = self.top
+        self.collected = False
+        self.saved = False
+
+class Log(pygame.sprite.Sprite):
+    def __init__(self, left, top):
+        pygame.sprite.Sprite.__init__(self)
+        self.image, self.rect = load_image('log.gif')
+        self.rect.left = left
+        self.rect.top = top
+
+class Life(pygame.sprite.Sprite):
+    def __init__(self, left, top):
+        pygame.sprite.Sprite.__init__(self)
+        self.image, self.rect = load_image('life.gif')
+        self.rect.left = left
+        self.rect.top = top
+
+class Frog(pygame.sprite.Sprite):
+    """Contains all the functions and information regarding the Frog,
+    player controllable character
+    """
+    def __init__(self):
+        pygame.sprite.Sprite.__init__(self) 
+        self.default_image = load_image('betterfrog.gif', -1)
+        self.carry_image = load_image('frogcarry.gif', -1)
+        self.image, self.rect = self.default_image
+        self.starting_left = 374
+        self.starting_top = 465
+        self.rect.left = self.starting_left
+        self.rect.top = self.starting_top
+        self.lives = 3
+        self.score = 0
+        self.game_over = False
+        self.on_left_log = False
+        self.on_right_log = False
+        self.perfect_score = True
+        self.good_score = True
+        self.start_time = time.time()
+        self.end_time = None
+        self.collecting = False
+        self.collecting_number = None
+
+    def carry_frog(self, left, top):
+        self.image, self.rect = self.carry_image
+        self.rect.left = left
+        self.rect.top = top
+
+    def not_carry_frog(self, left, top):
+        self.image, self.rect = self.default_image
+        self.rect.left = left
+        self.rect.top = top
+    
+    def add_score(self):
+        """ This method generates score for the user based on time taken to save the frog.
+        """
+        #Generate time taken to score:
+        self.end_time = time.time() - self.start_time
+        self.end_time = int(self.end_time)
+
+        #Generate base score:
+        if self.end_time <10:
+            self.base_score = 30
+        elif self.end_time >=11 and self.end_time <20:
+            self.base_score = 20
+        else:
+            self.base_score = 10
+        
+        #Generate actual score:
+        if self.perfect_score == True:
+            self.score += (self.base_score)*3
+        elif self.good_score == True:
+            self.score += (self.base_score)*2
+        else:
+            self.score += self.base_score
+
+        #Reset timer.
+        self.start_time = time.time()
 
=== added file 'Frogger/setup.py'
--- Frogger/setup.py	1970-01-01 00:00:00 +0000
+++ Frogger/setup.py	2010-03-12 10:44:17 +0000
@@ -0,0 +1,110 @@
+#! /usr/bin/env python
+
+###BEGIN LICENSE
+# Copyright (C) 2010 Daniel Bell <[e-mail]>
+# 
+#This program is free software: you can redistribute it and/or modify it      
+#under the terms of the GNU General Public License version 3, as published
+#by the Free Software Foundation.   
+#   
+#This program is distributed in the hope that it will be useful, but       
+#WITHOUT ANY WARRANTY; without even the implied warranties of   
+#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR  
+#PURPOSE.  See the GNU General Public License for more details.     
+#   
+#You should have received a copy of the GNU General Public License along
+#with this program.  If not, see <http://www.gnu.org/licenses/>.  
+### END LICENSE
+
+###
+# Setup Script for Frog Game: 0.3
+# Works on Mac, Windows and Unix based systems.
+#
+#Usage (Mac OS X):
+#    python setup.py py2app
+#
+#Usage (Windows):
+#    python setup.py py2exe
+#
+#Usage (UNIX):
+#    ./setup.py install
+###
+
+#Import stuff required to do the install. Stuff that could not be carried through gets ignored.
+try:
+from distutils.core import setup
+from distutils.command.install_data import install_data
+from distutils.dep_util import newer
+from distutils.log import info
+import glob
+import os
+import sys
+import py2exe
+from setuptools import setup
+except ImportError:
+    pass
+
+#Check if what we are running (and thus installing on) is MAC OSX.
+if sys.platform == 'darwin':
+    extra_options = dict(
+        setup_requires=['py2app'],
+        app=[frogger],
+        data_files =[
+                ('data/fonts', glob.glob('data/fonts/*.ttf')),
+                    ('data/images', glob.glob('data/images/*.png')),
+                    ('data/images', glob.glob('data/images/*.gif')),                                        
+                      ]
+        #py2app has certain flags/options that can be enabled.
+        #Setting Icon file, so that generated .app has the icon set automatically.         
+        options=dict(py2app=dict(iconfile=data/icons/frog-game.icns)),
+     )
+#if we are not using running MAC OSX check if we are running Windows.
+elif sys.platform == 'win32':
+    extra_options = dict(
+        windows = [
+            {
+                "script": "frogger",
+                "icon_resources": [(2, "frog-game.ico")]
+            }
+        data_files =[
+                    ('data/fonts', glob.glob('data/fonts/*.ttf')),
+                    ('data/images', glob.glob('data/images/*.png')),
+                    ('data/images', glob.glob('data/images/*.gif')),                                        
+                      ]
+     )
+#when its not MAC OSX or Windows we can assume its some sort of UNIX
+#based system.
+else:
+    extra_options = dict(
+        scripts=['frogger'],
+        data_files =[
+                    ('share/applications', ['data/frog-game.desktop']),
+                    ('share/icons/hicolor/scalable/apps', 
+                        glob.glob('data/icons/scalable/*.svg')),
+                    ('share/icons/hicolor/16x16/apps',
+                        glob.glob('data/icons/16x16/*.png')),
+                    ('share/icons/hicolor/22x22/apps', 
+                        glob.glob('data/icons/22x22/*.png')),
+                    ('share/icons/hicolor/24x24/apps',
+                        glob.glob('data/icons/24x24/*.png')),
+                    ('share/icons/hicolor/48x48/apps', 
+                        glob.glob('data/icons/48x48/*.png')),
+                    ('share/frog-game/data/fonts', 
+                        glob.glob('data/fonts/*.ttf')),
+                    ('share/frog-game/data/images', 
+                        glob.glob('data/images/*.png')),
+                    ('share/frog-game/data/images', 
+                        glob.glob('data/images/*.gif')),           
+                 ],
+     )
+
+setup(
+    version='0.2',
+    description='Fun survival/rescue game!',
+    long_description="The baby frogs are lost! Can you rescue them?",
+    author='Daniel Bell (dbell)',
+    author_email='[e-mail]',
+    url='https://launchpad.net/frogger',
+    license='GPL v3',
+    **extra_options
+)
 
=== removed file 'Frogger/sprites.py'
--- Frogger/sprites.py	2010-02-13 16:37:05 +0000
+++ Frogger/sprites.py	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-try:
-    import sys
-    import os
-    import pygame
-    import time
-    from pygame.locals import *
-    import weakref
-except ImportError, err:
-    print "Failure loading module. %s" % (err)
-    sys.exit(2)
-
-def load_image(name, colorkey=None):
-    fullname = os.path.join('data/images/', name)
-    try:
-        image = pygame.image.load(fullname)
-    except pygame.error, message:
-        print 'Cannot load image:', fullname
-        raise SystemExit, message
-    image = image.convert()
-    if colorkey is not None:
-        if colorkey is -1:
-            colorkey = image.get_at((0,0))
-        image.set_colorkey(colorkey, RLEACCEL)
-    return image, image.get_rect()    
-
-
-class Leftcar(pygame.sprite.Sprite):
-    """
-        Left Car functions.
-    """
-    def __init__(self, left, top):
-        pygame.sprite.Sprite.__init__(self)
-        self.image, self.rect = load_image('bettercar2.gif', -1)
-        self.rect.left = left
-        self.rect.top = top
-        
-class Rightcar(pygame.sprite.Sprite):
-    """
-        Left Car functions.
-    """
-    def __init__(self, left, top):
-        pygame.sprite.Sprite.__init__(self)
-        self.image, self.rect = load_image('bettercar.gif', -1)
-        self.rect.left = left
-        self.rect.top = top   
-
-class Homefrog(pygame.sprite.Sprite):
-    def __init__(self, left, top):
-        pygame.sprite.Sprite.__init__(self)
-        self.image, self.rect = load_image('smallerfrog.gif', -1)
-        self.rect.left = left
-        self.rect.top = top
-
-class Log(pygame.sprite.Sprite):
-    def __init__(self, left, top):
-        pygame.sprite.Sprite.__init__(self)
-        self.image, self.rect = load_image('log.gif')
-        self.rect.left = left
-        self.rect.top = top
-
-class Life(pygame.sprite.Sprite):
-    def __init__(self, left, top):
-        pygame.sprite.Sprite.__init__(self)
-        self.image, self.rect = load_image('life.gif')
-        self.rect.left = left
-        self.rect.top = top
-
-class Frog(pygame.sprite.Sprite):
-    """
-        Contains all the functions and information regarding the Frog, player controllable character
-    """
-    def __init__(self):
-        pygame.sprite.Sprite.__init__(self) 
-        self.image, self.rect = load_image('betterfrog.gif', -1)
-        self.rect.left = 266
-        self.rect.top= 661
-        self.lives = 3
-        self.score = 0
-        self.level = 1
-        self.gameOver = False
-        self.frogsHome = [False, False, False, False, False]
-        self.onLeftLog = False
-        self.onRightLog = False
-        self.perfectScore = True
-        self.goodScore = True
-        self.startTime = time.time()
-
-    def update(self):
-        #moves the frog
-        self.gameAreaCheck()
-    
-    def scored(self):
-            
-        self.rect.left = 266
-        self.rect.top= 661
-
-        self.endTime = time.time() - self.startTime
-        self.endTime = int(self.endTime)
-
-        if self.endTime <5:
-            self.baseScore = 30
-        elif self.endTime >=6 and self.endTime <15:
-            self.baseScore = 20
-        else:
-            self.baseScore = 10
-
-        if self.perfectScore == True:
-            self.score += (self.baseScore + (self.level*5))*3
-        elif self.goodScore == True:
-            self.score += (self.baseScore + (self.level*5))*2
-        else:
-            self.score += self.baseScore + (self.level*5)
-
-        self.startTime = time.time()
-    
-    def gameAreaCheck(self):
-        if self.onLeftLog != True and self.onRightLog != True:
-            if self.rect.top >=662:
-                self.rect.top -=45
-            if self.rect.left <=0:
-                self.rect.left +=20
-            if self.rect.right >=595:
-                self.rect.left -=20
-        else:
-            if self.rect.right <=0:
-                self.loseLife()
-            if self.rect.left >=600:
-                self.loseLife()
-            
-    
-    def loseLife(self):
-        self.startTime = time.time()
-        self.goodScore = False
-        self.perfectScore = False
-        self.onLeftLog = False
-        self.onRightLog = False
-        self.rect.left = 266
-        self.rect.top= 661
-        self.lives -= 1
-        if self.lives <= 0:
-            self.gameOver = True