Added extra end Periods

Fixed a lot of missing end periods. Improved consistency of cat dialogue.

LICENSE

@@ -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>.

README.md

@@ -1,46 +1,51 @@
-![My image](https://raw.github.com/fernjager/game-off-2013/formula/Main-Screen-MockupV11-24.png)
+![GitHub Game Off Game Jam](https://f.cloud.github.com/assets/121322/1436486/25f88b78-4158-11e3-9b23-43596516362c.png)
 
-## Overview
+## The Challenge
 
-It is another Thanksgiving holiday, a time of retrospection and blessings.
+You have the entire month of November to create a **web-based** game *loosely* based on the theme "change".
 
-You have been invited to craft the centerpiece of the American thanksgiving dinner, the turkey. Woo your girlfriend / boyfriend and be judged by your future in-laws! Apply your culinary expertise to impress your family!
+What do we mean by **loosely** based on "change"? We literally mean, *loosely* based. Some examples might be a FPS where you throw the [loose change](http://www.merriam-webster.com/dictionary/loose%20change) in your pockets at the enemy or perhaps a puzzle game where you have to [change](http://www.merriam-webster.com/dictionary/change) form to overcome obstacles.
 
-## Turkey Cooking Simulator Features:
-* Real-time cooking action!
-* Unparalleled turkey-based thermodynamics!
-* Hours of gripping stories and drama!
-* Accessorize your turkey with stuffing, frills, and other awesomeness!
-* Day-night environmental cycle!
-* High-fidelity stereo audio!
-* Masterfully crafted scenes of an American household!
+Your game. Your rules. You can participate either as an individual or as a team. You're encouraged to use open source libraries, frameworks, graphics, and sounds in your game.
 
-## Compatibility
-* [Chrome 22](https://www.google.com/intl/en/chrome/) - Full compatibility, recommended browser.
-* [Safari 6.0.5](http://www.apple.com/safari/) - Full compatibility, recommended browser.
-* [Firefox 25](http://www.mozilla.org/en-US/firefox/new/) - Playable. [GStreamer] (http://gstreamer.freedesktop.org/) required for sound on Mac. Sound only plays once on Windows
-* [Internet Explorer 11](http://windows.microsoft.com/en-us/internet-explorer/download-ie) - Not recommended. Sound looping issues.
+## The Prizes
 
-## Open Source!
-* Uses the CreateJS library for HTML5 Canvas: https://github.com/CreateJS/
+We're giving away shiny new [iPad Airs](http://www.apple.com/ipad-air/) (16GB models) to our 5 lucky winners. Runners-up will receive a $100 credit for the [GitHub Shop](http://shop.github.com/), where they can grab some of our :octocat: shirts, hoodies, stickers, and more!
 
-## Authors
+All winners and runners-up will be showcased on our blog.
 
-* [Scott R. Mobley](http://www.linkedin.com/in/mobleyscott) - Turkey Overlord and Master of Dialogue
-* [Robert J. Chen](http://fernjager.net) - Javascript Wizard
-* [Benjamin Kwok](mailto:tengen1112@gmail.com) - Unpaid Art Peasant
-* Sheen Kao -  Finite Elementalist Supreme
+## Judging
 
-## Backup Mirror
-* http://fernjager.net/game/index.html
+We have a handful of judges who are eager to play your games!  
 
-## Licenses and Credit
-![CC](http://i.creativecommons.org/l/by-nc/3.0/88x31.png) 
+* [Adam 'Atomic' Saltsman](https://twitter.com/adamatomic) - Game maker and dad, creator of Canabalt and Flixel.
+* [Aleissia Laidacker](https://twitter.com/Aleissia) - Team Lead AI at Ubisoft.
+* [David Czarnecki](http://twitter.com/CzarneckiD), Lead Engineer at Agora Games.
+* [Matt Hackett](https://twitter.com/richtaur), Co-founder of Lost Decade Games.
+* [Kyros Starr](https://twitter.com/bearwitched), Gaymer and Tech Writer at GitHub.
+* [Lee Reilly](http://twitter.com/leereilly), Gamer Dad and Software Developer at GitHub.
+* [Romana Ramzan](https://twitter.com/Manak/), Denki's Player Champion, Global Game Jam Director.
 
-* Unless indicated otherwise in the credits page:
-* All original artwork and writing are licensed under the Creative Commons Attribution-NonCommercial BY-NC 
-* Artwork: Benjamin Kwok.
-* Writing: Scott Mobley.
-* Source code is released under GPL v3 by Robert Chen.
-* See credits screen for full attribution of all assets.
+## The Rules
 
+* To qualify for entry, you must fork the [github/game-off-2013](https://github.com/github/game-off-2013) repository to your individual or organization account. Not sure which account type would be best for you? Check out this handy [help article](https://help.github.com/articles/what-s-the-difference-between-user-and-organization-accounts), which explains the differences between the two types of accounts.
+* All entries must be web-based, i.e. playable in a browser. HTML5, WebGL, Unity, Torque 3D, and Flash are all possible - just be sure the source is made available on your fork.
+* You must be over the age of 13.
+
+## Instructions
+
+* If you don't already have a GitHub account, [sign up for a personal account now](https://github.com/signup/free) - it's free!
+* Fork the [github/game-off-2013](https://github.com/github/game-off-2013) repository to your individual account (or to a [free organization account](https://github.com/organizations/new)).
+* Be sure to follow [@github](https://twitter.com/github) on Twitter for updates.
+* Make sure your code is pushed to the master branch of your forked repository before Dec 1st!
+* Make sure you have a `README` file that includes a brief description of your game, what open source projects (if any) you used, and a screenshot.
+* Your repository should have a brief description and the playable URL entered into the fields shown below (this will make our judging process easier):
+
+![image](https://f.cloud.github.com/assets/121322/1436584/fd721126-415a-11e3-9f3a-e94262074573.png)
+
+## Comments / Questions / Help
+
+* New to Git, GitHub, and/or version control? Check out our [help documentation](https://help.github.com/) to get started!
+* Questions about Git/GitHub? Please email [support@github.com](mailto:support@github.com) and be sure to include 'GitHub Game Off' in the subject.
+* Questions specific to the GitHub Game Off? Please [create an issue](https://github.com/github/game-off-2013/issues/new). This will be the official FAQ.
+* The official Twitter hashtag is [#ggo13](https://twitter.com/search/realtime?q=%23ggo13).

index.html

@@ -4,7 +4,7 @@
   <style type="text/css">
 </style>
 </head>
-  <body bgcolor="#250c00">
+  <body>
 
     <center>
     <div class="canvasContainer">
@@ -12,7 +12,7 @@
     </div>
   </center>
   </body>
-  <script src="//code.createjs.com/createjs-2013.09.25.min.js"></script>
+  <script src="http://code.createjs.com/createjs-2013.09.25.min.js"></script>
   <script src="js/model.js"></script>
   <script src="js/soundmanager.js"></script>
   <script src="js/stories.js"></script>

js/dialogue.js

@@ -65,10 +65,6 @@ function DialogUI( stage, gameState ){
  	this.textContent.addEventListener( "mouseout", function(){ document.body.style.cursor='default'; } );
  	this.textContent.addEventListener( "click", function(){ setTimeout( clickEvent, 100); });
 
- 	// negate double setTimeout if clicked
- 	var oldTime = new Date().getTime();
- 	var delayCounter = 0;
-
 	this.endFunc = function(){};
 
  	this.showDialog= function( textSeq ){
@@ -94,15 +90,13 @@ function DialogUI( stage, gameState ){
  			that.showRandomConvo();
  			return;
  		}
- 		delayCounter = 0;
- 		oldTime = new Date().getTime();
+
  		that.currDialogueSeq = new DialogueSequence( textSeq.seq );
  		var nextDialogue = that.currDialogueSeq.next();
 
  		that.endFunc = textSeq.endFunc || function(){};
 
- 		that.textContent.text=nextDialogue[1].replace(/\[GenderPronoun\]/g, gameState.pronoun ).replace(/\[Player\]/g, gameState.name || "Sam" );
-
+ 		that.textContent.text=nextDialogue[1].replace(/\[GenderPronoun\]/g, gameState.pronoun ).replace(/\[Player\]/g, gameState.name );
  		that.currentFace.y = 250;
  		that.currentFace = peopleImg[nextDialogue[0]] || that.currentFace;
  		that.autoAdvance = textSeq.autoAdvance;
@@ -127,6 +121,9 @@ function DialogUI( stage, gameState ){
 
  	gameState.pubsub.subscribe( "ShowDialog", this.showDialog );
 
+ 	// negate double setTimeout if clicked
+ 	var oldTime = new Date().getTime();
+ 	var delayCounter = 0;
  	var clickEvent = function( timer ){
 
  		if( !peopleImg["Me"] ){
@@ -138,7 +135,7 @@ function DialogUI( stage, gameState ){
  			var nextDialogue = that.currDialogueSeq.next();
 
  			that.dialogMotionQueue.push(DIALOG_SHOWING);
- 			that.textContent.text=nextDialogue[1].replace(/\[GenderPronoun\]/g, gameState.pronoun ).replace(/\[Player\]/g, gameState.name || "Sam" );
+ 			that.textContent.text=nextDialogue[1];
  			if(DEBUG) console.log("showing face:" +nextDialogue[0] );
 
  			// swap out face immediately
@@ -168,6 +165,7 @@ function DialogUI( stage, gameState ){
 
     return {
     	tick: function(){
+    		delayCounter = new Date().getTime() - oldTime;
 
     		if( that.autoAdvance == true && that.dialogBox.y ==0 && delayCounter > ( (that.textContent.text.length * MILLIS_PER_CHAR) < 2000 ? 2000 : (that.textContent.text.length * MILLIS_PER_CHAR)  ) ){
     			clickEvent();
@@ -207,7 +205,6 @@ function DialogUI( stage, gameState ){
     		if( that.dialogMotionQueue.length > 0 && that.dialogState == DIALOG_PAUSING ){
     			that.dialogState = that.dialogMotionQueue.shift();
     		}
-    		delayCounter = new Date().getTime() - oldTime;
     	},
 
     	minDialog: function(){

js/main.js

@@ -71,7 +71,6 @@ function GameState(){
 
     // Screens
     queue.loadFile( {id: "res/screens/DifficultyScreen/Difficulty-Selection.png", src:"res/screens/DifficultyScreen/Difficulty-Selection.png"} );
-    queue.loadFile( {id: "res/screens/DifficultyScreen/ButtonsandText.png", src:"res/screens/DifficultyScreen/ButtonsandText.png"} );
 	queue.loadFile( {id: "res/screens/DifficultyScreen/ButtonMale.png", src:"res/screens/DifficultyScreen/ButtonMale.png"} );
     queue.loadFile( {id: "res/screens/DifficultyScreen/ButtonFemale.png", src:"res/screens/DifficultyScreen/ButtonFemale.png"} );
 
@@ -88,11 +87,11 @@ function GameState(){
     queue.loadFile( {id: "HelpP3P4", src:"res/screens/HelpCreditsScreen/HelpP3P4.png" } );
     queue.loadFile( {id: "HelpP5P6", src:"res/screens/HelpCreditsScreen/HelpP5P6.png" } );
     queue.loadFile( {id: "HelpP7P8", src:"res/screens/HelpCreditsScreen/HelpP7P8.png" } );
-    queue.loadFile( {id: "HelpP9P10", src:"res/screens/HelpCreditsScreen/HelpP9P10.png" } );
 
 
     queue.loadFile( {id: "ScoreScreenFile", src:"res/screens/ScoreScreen/Score-Evaluation-1.png" } );
     queue.loadFile( {id: "ScoreScreenFile", src:"res/screens/ScoreScreen/Score-Evaluation-2.png" } );
+    queue.loadFile( {id: "HelpScreenFile", src:"res/screens/HelpCreditsScreen/Credits.png" } );
 
     queue.loadFile( {id: "MarketScreenfile", src:"res/screens/MarketScreen/MarketScreen.png"} );
 
@@ -101,6 +100,7 @@ function GameState(){
 	queue.loadFile( {id: "MarketSoundFile", src:"res/sound/Store/Waterford.mp3"} );
 
 	// UI sounds
+    queue.loadFile( {id: "UILowClickFile", src:"res/sound/GUI/lowclick.mp3"} );
     queue.loadFile( {id: "UIClickFile", src:"res/sound/GUI/click.mp3"} );
     queue.loadFile( {id: "UIBuzzFile", src:"res/sound/GUI/buzz.mp3"} );
     queue.loadFile( {id: "UIDingFile", src:"res/sound/GUI/ding.mp3"} );
@@ -108,11 +108,11 @@ function GameState(){
     // Kitchen Items
     queue.loadFile( {id: "res/screens/KitchenScreen/KitchenScreen.png", src:"res/screens/KitchenScreen/KitchenScreen.png"});
     queue.loadFile( {id: "res/screens/KitchenScreen/FinalConfirmation.png", src:"res/screens/KitchenScreen/FinalConfirmation.png"});
-	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.png", src:"res/screens/KitchenScreen/TurkeyState1Small.png"});
-	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState2Small.png", src:"res/screens/KitchenScreen/TurkeyState2Small.png"});
-	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3Small.png", src:"res/screens/KitchenScreen/TurkeyState3Small.png"});
-	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4Small.png", src:"res/screens/KitchenScreen/TurkeyState4Small.png"});
-	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5Small.png", src:"res/screens/KitchenScreen/TurkeyState5Small.png"});
+	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState1Small.svg", src:"res/screens/KitchenScreen/TurkeyState1Small.svg"});
+	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState2Small.svg", src:"res/screens/KitchenScreen/TurkeyState2Small.svg"});
+	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState3Small.svg", src:"res/screens/KitchenScreen/TurkeyState3Small.svg"});
+	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState4Small.svg", src:"res/screens/KitchenScreen/TurkeyState4Small.svg"});
+	queue.loadFile( {id: "res/screens/KitchenScreen/TurkeyState5Small.svg", src:"res/screens/KitchenScreen/TurkeyState5Small.svg"});
 
 	queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchenGlow.png", src:"res/screens/KitchenScreen/CookbookKitchenGlow.png"});
 	queue.loadFile( {id: "res/screens/KitchenScreen/CookbookKitchen.png", src:"res/screens/KitchenScreen/CookbookKitchen.png"});
@@ -159,7 +159,7 @@ function GameState(){
 	queue.loadFile( {id: "res/sound/Kitchen/Oven_Door_Peek_Open.mp3", src:"res/sound/Kitchen/Oven_Door_Peek_Open.mp3"});
     queue.loadFile( {id: "res/sound/Kitchen/Close_Cookbook.mp3", src:"res/sound/Kitchen/Close_Cookbook.mp3"});
     queue.loadFile( {id: "res/sound/Kitchen/Open_Cookbook.mp3", src:"res/sound/Kitchen/Open_Cookbook.mp3"});
-    queue.loadFile( {id: "res/sound/Kitchen/Explosion_Sound.mp3", src:"res/sound/Kitchen/Explosion_Sound.mp3"} );
+    queue.loadFile( {id: "res/sound/Kitchen/sizzle.mp3", src:"res/sound/Kitchen/sizzle.mp3"} );
     queue.loadFile( {id: "res/sound/Kitchen/Double_Beep.mp3", src:"res/sound/Kitchen/Double_Beep.mp3"} );
 
     // Market Items
@@ -246,8 +246,7 @@ function GameState(){
     queue.loadFile( {id: "res/screens/Window/Win10.png", src:"res/screens/Window/Win10.png"});
     queue.loadFile( {id: "res/screens/Window/Win11.png", src:"res/screens/Window/Win11.png"});
     queue.loadFile( {id: "res/screens/Window/Tree_Animation.png", src:"res/screens/Window/Tree_Animation.png"});
-    queue.loadFile( {id: "res/screens/Window/Test4TransparencyFull.png", src:"res/screens/Window/Test4TransparencyFull.png"});
-    queue.loadFile( {id: "res/screens/Window/Stars.png", src:"res/screens/Window/Stars.png"});
+    queue.loadFile( {id: "res/screens/Window/Test4TransparencyFull.svg", src:"res/screens/Window/Test4TransparencyFull.svg"});
 
 
 
@@ -284,11 +283,11 @@ function GameState(){
 
     /* all turkeys */
     this.turkeyStates = [
-        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.png" ),
-        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2Small.png" ),
-        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3Small.png" ),
-        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4Small.png" ),
-        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5Small.png" )
+        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState1Small.svg" ),
+        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState2Small.svg" ),
+        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState3Small.svg" ),
+        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState4Small.svg" ),
+        new createjs.Bitmap( "res/screens/KitchenScreen/TurkeyState5Small.svg" )
     ];
 
 	this.purchasedItems = [];
@@ -355,7 +354,7 @@ function GameUI( canvasElem, gameState ){
 	var soundManager = new SoundManager( gameState );
 
 	this.activeScreenObj = new LoadingScreen( this.stage, gameState );
-	var textContent = new createjs.Text( "", "20px Arial", "white" );
+	var textContent = new createjs.Text( "", "20px Arial", "black" );
 	textContent.x = 750;
 	textContent.y = 30;
 	//this.stage.addChild( textContent);

js/model.js

@@ -1,29 +1,36 @@
-function TurkeyLayer( name, layerNumber1, turkeyModel, ovenModel ){
+function TurkeyLayer( name, percentRadius, turkeyModel, ovenModel ){
 	var that = this;
 
 	this.name = name;
-	this.layerNumber=layerNumber1;
+	this.percentRadius=percentRadius;
+	this.initialTemp = 20;
 	this.waterLost = 0;
 	this.finalTemperature = 20;
-	this.cookCondition = "Raw";
-	this.highestTemp = 0;
+	this.cookCondition = "Raw"; 
+	
     return {
     	updateTemperatureTick: function(){
-    		that.finalTemperature = turkeyModel.globTemp[that.layerNumber]
-			if(DEBUG) console.log(turkeyModel.globTemp);
-			that.highestTemp = that.finalTemperature > that.highestTemp ? that.finalTemperature : that.highestTemp;
+    		that.finalTemperature = UtilityFunctions.transientSphereSeries( turkeyModel.density,
+    																		turkeyModel.thermalConduct,
+    																		turkeyModel.heatConvection,
+    																		turkeyModel.cp,
+    																		percentRadius * turkeyModel.totalRadius,
+    																		turkeyModel.totalRadius,
+    																		that.initialTemp,
+    																		ovenModel.steadyTemp,
+    																		ovenModel.globalTime );
 			that.waterLost = that.waterLost + UtilityFunctions.waterLoss( that.finalTemperature );
-			that.cookCondition = UtilityFunctions.cookCondition(that.waterLost, that.name);
-			if(DEBUG) console.log( that.name + ": "+ that.waterLost + " " + that.cookCondition + " " + that.finalTemperature + " C" );
+			that.cookCondition = UtilityFunctions.cookCondition(that.waterLost);
+			if(DEBUG) console.log( that.name + ": "+ that.waterLost + " " + that.cookCondition);
     	},
+		resetLayerTemps: function(){
+			that.initialTemp = that.finalTemperature;
+		},
 		getCondition: function(){
 			return that.cookCondition;
 		},
 		getTemperature: function(){
 			return that.finalTemperature;
-		},
-		getHighestTemp: function(){
-			return that.highestTemp;
 		}
 
     }
@@ -31,71 +38,45 @@ function TurkeyLayer( name, layerNumber1, turkeyModel, ovenModel ){
 
 
 function TurkeyModel( weight, ovenModel ){
-	this.density = 700; 	 	 // kg/m3 Assuming Density of Water 1000 kg/m3
-	this.cp = 2810;			 	 // 2810 J/kg K for Turkey. Extra is to semi-account for water evaporation energy
+	this.density = 1050; 	 	 // kg/m3 Assuming Density of Water 1000 kg/m3
+	this.cp = 2000;			 	 // 2810 J/kg K for Turkey. Extra is to semi-account for water evaporation energy
 	this.heatConvection = 9; 	 // W/m2 K Some Reasonable estimate for natural Convection. Change as needed. 5-25
 	this.thermalConduct = 0.412; // W/m K // Chicken
 	this.skin = {};
 	this.body = {};
 	this.core = {};
-	this.splitsNum = 20;
-		console.log(UtilityFunctions.lbs2kgs(weight))
-	this.totalRadius = UtilityFunctions.calculateRadius( UtilityFunctions.lbs2kgs(weight), this.density );
+
+	this.totalRadius = UtilityFunctions.calculateRadius( weight, this.density );
 
 	
-	this.totalLayers = [ new TurkeyLayer("Skin", this.splitsNum-1, this, ovenModel ),
-						 new TurkeyLayer("Body", this.splitsNum-10, this, ovenModel ),
-						 new TurkeyLayer("Core", 1, this, ovenModel ) ];
+	this.totalLayers = [ new TurkeyLayer("Skin", 0.85, this, ovenModel ),
+						 new TurkeyLayer("Body", 0.45, this, ovenModel ),
+						 new TurkeyLayer("Core", 0.01, this, ovenModel ) ];
 
 	// Whenever temperature is changed
-	this.updateLayerTemps = function() {
-		this.globTemp = UtilityFunctions.transientSphereSeries( this.density,
-    															this.thermalConduct,
-    															this.heatConvection,
-    															this.cp,
-    															this.totalRadius,
-																ovenModel.tempInfini,
-																this.splitsNum,
-																this.deltar,
-																this.globTemp,
-																this.pointRadius
-																);
+	this.updateLayerTemps = function(){
 			for (var i in this.totalLayers ){
 		        this.totalLayers[i].updateTemperatureTick();
 	    }
 	};
 	
-	this.resetLayerTemps = function() {
-		for (var i in this.totalLayers ) {
+	this.resetLayerTemps = function(){
+		for (var i in this.totalLayers ){
 		    this.totalLayers[i].resetLayerTemps();
 	    }
 	};
-	
-	//Sheen Model Stuff
-	this.globTemp=[];
-	this.pointRadius = []
-	this.splitsNum = 20;
-	this.deltar = this.totalRadius/this.splitsNum; //20 Data Points
-	
-	this.initializePoints = function() {
-		var step = ( this.totalRadius - this.deltar ) / ( this.splitsNum - 1 );
-		for (var i = 0; i<this.splitsNum ; i++ ) {
-			this.pointRadius.push(step*i+this.deltar);
-			this.globTemp.push(20+step*i); //Starts at 20 C for initilizating
-		}	
-	};
-	this.initializePoints()
-	
-	
 }
 
 function OvenModel( turkeyWeight, gameState ) {
 	var that = this;
 	this.tempInfini=20; //C
 	this.setTemp = 20;
+	this.steadyTemp = 20;
+	this.steadyTimer = 0;
 	this.globalTime = 0;
-	
-	var turkey = new TurkeyModel(turkeyWeight, this );
+
+	var turkey = new TurkeyModel(9.07185, this );
+
 	var proportional = 0.004; // This value is arbitrary to how fast you want the temperatures to converge. (Or oscillate, which could be realistic as well)
 	var errorTolerance = 10; //Stove is accurate to 1 degree Celcius Should hopefully oscillate below that value.
    	// Equalize temp will need to be sent each time iteration
@@ -109,6 +90,13 @@ function OvenModel( turkeyWeight, gameState ) {
             }
 
             if( error>errorTolerance ) {
+				if (this.steadyTimer>=80) {
+				//Reset the model's time calculation if there are major changes in the tolerance of the temperature or the steady timer expires
+					this.steadyTimer = 0;
+					this.globalTime = 0;
+					this.steadyTemp = this.tempInfini
+					turkey.resetLayerTemps();
+				}
 				return(true);
             }
     	}
@@ -117,18 +105,15 @@ function OvenModel( turkeyWeight, gameState ) {
     		return {
     			"skin" : {
     				"temp": turkey.totalLayers[0].getTemperature(),
-    				"cond": turkey.totalLayers[0].getCondition(),
-    				"highest" : turkey.totalLayers[0].getHighestTemp()
+    				"cond": turkey.totalLayers[0].getCondition()
     			},
     			"body" : {
     				"temp": turkey.totalLayers[1].getTemperature(),
-    				"cond": turkey.totalLayers[1].getCondition(),
-    				"highest" : turkey.totalLayers[1].getHighestTemp()
+    				"cond": turkey.totalLayers[1].getCondition()
     			},
     			"core" : {
     				"temp": turkey.totalLayers[2].getTemperature(),
-    				"cond": turkey.totalLayers[2].getCondition(),
-    				"highest" : turkey.totalLayers[2].getHighestTemp()
+    				"cond": turkey.totalLayers[2].getCondition()
     			}
     		};
     	},
@@ -149,15 +134,19 @@ function OvenModel( turkeyWeight, gameState ) {
     	},
 	    secondTick: function(){
 			that.globalTime = that.globalTime + 1;
+			that.steadyTimer = that.steadyTimer + 1;
 	    	if ( that.equalizeTemp() ) {
 
 	    		// Turn on oven light
 				gameState.pubsub.publish( "OvenLight", "On" );
 			}
 			else {
+				that.steadyTemp = that.tempInfini;
 				// Turn off oven light
 				gameState.pubsub.publish( "OvenLight", "Off" );
 			}
+				if(DEBUG) console.log("Steady Temp " + that.steadyTemp)
+				if(DEBUG) console.log("Steady Timer " + that.steadyTimer)
 				if(DEBUG) console.log("Oven Temp " + that.tempInfini )
 				turkey.updateLayerTemps();
 	    }
@@ -190,6 +179,26 @@ UtilityFunctions = {
 		return complexRadius;
 	},
 
+	findAllRoots: function(min,max,splitsNum,Biot) {
+		var step = ( max - min ) / ( splitsNum - 1 );
+		var answer;
+		var negativeTest;
+		var storage = [];
+        for (var i = step; i < max; i=i+step ) {
+                negativeTest = this.lambdaFormula(i-step, Biot)*this.lambdaFormula(i, Biot);
+                if (negativeTest <= 0) {
+                         answer = this.bisectionMethod(i-step,i,Biot);
+                        if (answer !=undefined) {
+                                storage.push(answer);
+                        }
+                }
+                else {
+                        //if(DEBUG) console.log("No Bracketed Root " + negativeTest)
+                }
+        }
+		return storage;
+	},
+
 	sphereVolume: function(radius) {
 		return((4/3)*Math.PI*Math.pow(radius,3))
 	},
@@ -198,50 +207,74 @@ UtilityFunctions = {
 		return (Math.pow(10,(temperature-20)/80)-1)
 	},
 
-	transientSphereSeries: function( density, thermalConduct, heatConvection, cp, rTotal, tempInfinity, splitsNum, deltar, globTemp,pointRadius) {
-
-//Not Global Stuff
-		var r0 = rTotal;
-		var deltat = 0.1
-			
-		var alpha = thermalConduct/(density*cp)
-		var h=heatConvection; 
-
-		for (var j=0; j<(1/deltat); j++ ) {
-			var dTdr=[]
-		//	globTemp[splitsNum-1] should be last entry in globtemp
-				for (var k=0; k<splitsNum; k++){
-				if (k==0) {
-					dTdr.push((globTemp[1] - globTemp[0])/deltar) }
-				else if (k==splitsNum-1) {
-					dTdr.push((globTemp[splitsNum-1] - globTemp[splitsNum-2])/deltar)}
-				else {
-					dTdr.push((globTemp[k+1] - globTemp[k-1])/(2*deltar))}
-				}
-				dTdr[splitsNum-1] = heatConvection*(tempInfinity-globTemp[splitsNum-1])/thermalConduct
-				
-				var parenthesis = []
-				for (var k=0; k<splitsNum; k++){
-					parenthesis.push(dTdr[k]*Math.pow(pointRadius[k],2))
-				}
-				
-				dPdr = []
-				for (var k=0; k<splitsNum; k++){
-				if (k==0) {
-					dPdr.push((parenthesis[1] - parenthesis[0])/deltar) }
-				else if (k==splitsNum-1) {
-					dPdr.push((parenthesis[splitsNum-1] - parenthesis[splitsNum-2])/deltar)}
-				else {
-					dPdr.push((parenthesis[k+1] - parenthesis[k-1])/(2*deltar))}
-				}
-				
-				for (var k=0; k<splitsNum; k++){
-					globTemp[k]=alpha*dPdr[k]/Math.pow(pointRadius[k],2)*deltat + globTemp[k] //dTdr * deltaT in one loop
-				}
-			//dTdt(1)=dTdt(1)/2; 
-				}
 
-		return(globTemp)
+	bisectionMethod: function(min,max,Biot) {
+		errorTolerance = (1/Math.pow(10,8))
+		result = Infinity // some large value to ensure the calculation goes through.
+		negativeTest =this.lambdaFormula(min, Biot)*this.lambdaFormula(max, Biot)
+        if (negativeTest <=0 ) {
+            var antiFreeze=0;
+            while (Math.abs(result) > errorTolerance && antiFreeze<=500) { //The greater the antiFreeze, the more wasted cycles around a singularity        
+                    lambdaN = (min+max)/2
+                    result=this.lambdaFormula(lambdaN, Biot)
+                    if (Math.abs(result) <= errorTolerance && result<=errorTolerance) {
+                            return (lambdaN); //At Root
+                    }
+                    else if ((this.lambdaFormula(min, Biot)*this.lambdaFormula(lambdaN, Biot))>=0) {
+                            min=lambdaN;
+                    }
+                    else if ((this.lambdaFormula(max, Biot)*this.lambdaFormula(lambdaN, Biot))>=0) {
+                            max=lambdaN;
+                    }
+                    antiFreeze++
+            }
+        }
+	},
+
+	lambdaFormula: function( lambdaN, Biot ) {
+		var result = 1-lambdaN*(1/Math.tan(lambdaN))-Biot;
+		return(result)
+	},
+
+	transientSphereSeries: function( density, thermalConduct, heatConvection, cp, rPosition, rTotal, tempInitial, tempInfini, t ){
+		var min = 0;
+		var max = 10000; // This are for setting Lambda boundaries and nothing else
+
+		var sum=0;
+		var alpha = thermalConduct/(density*cp);
+		var lambdaN;
+		var sinPortion;
+		var exponentialPortion;
+		var frontCoefficientPortion;
+
+
+		//if(DEBUG) console.log("Alpha is " + alpha)
+
+		var Fourier = (alpha*t)/Math.pow(rTotal,2)
+		//if(DEBUG) console.log("Fourier is " +  Fourier)
+
+		var biotNum = heatConvection * rTotal/thermalConduct
+
+	    if ( biotNum != this.cachedBiot ) {
+	            if(DEBUG) console.log("Recalculating Lambda Terms")
+	            this.cachedLambda = this.findAllRoots(min,max,max*Math.PI*10,biotNum)
+	            this.cachedBiot = biotNum;
+	    }
+
+		//if(DEBUG) console.log("The Biot Value is " + biotNum)
+
+		for (var i = 0; i<this.cachedLambda.length; i++) {
+		        var lambdaN = this.cachedLambda[i];
+		        var sinPortion= Math.sin(lambdaN*rPosition/rTotal)/(lambdaN*rPosition/rTotal);
+		        var exponentialPortion = (1/Math.exp(Math.pow(lambdaN,2)*Fourier));
+		        var frontCoefficientPortion = 4*(Math.sin(lambdaN)-(lambdaN*Math.cos(lambdaN)))/ (2*lambdaN-Math.sin(2*lambdaN));
+		        sum = frontCoefficientPortion*exponentialPortion*sinPortion + sum;
+		}
+
+		tempAtTimeAndRadius=(sum*(tempInitial-tempInfini))+tempInfini
+
+		if(DEBUG) console.log("The Temperature at radius " + rPosition + " m and time " + t/60/60 + " hours is " + tempAtTimeAndRadius + " C or " + this.C2F(tempAtTimeAndRadius) + " F");
+		return(tempAtTimeAndRadius)
 	},
 
 	/* Utility Functions */
@@ -257,62 +290,31 @@ UtilityFunctions = {
 	randRange: function(min, max){
 		return Math.floor(Math.random()*(max-min+1))+min;
 	},
-	cookCondition: function(cookValue, layerName){
-
-		if( layerName == "Skin" || layerName == "Body" ){
-			var multiplier = 1;
-			if (cookValue>=multiplier*600000) {
-				return ["Fire", (cookValue)/(multiplier*700000),"fire"];
-			}
-			else if(cookValue>=multiplier*400000) {
-				return ["Burnt", (cookValue)/(multiplier*600000), "burnt"];
-			}
-			else if (cookValue>=multiplier*300000) {
-				return ["Dry", (cookValue)/(multiplier*350000), "dry"];
-			}
-			else if (cookValue>=multiplier*250000){ // >250000
-				return ["Cooked", (cookValue)/(multiplier*300000), "overcooked"];
-			}
-			else if (cookValue>=multiplier*80000) { // >50000
-				return ["Cooked", (cookValue)/(multiplier*250000), "cooked"];
-			}
-			else if (cookValue>=multiplier*50000){
-				return ["Undercooked", (cookValue)/(multiplier*80000), "slightly cooked"];
-			}
-			else if (cookValue>=multiplier*25000) { //
-				return ["Undercooked", (cookValue)/(multiplier*50000), "undercooked"];
-			}
-			else {
-				return ["Raw", 1, "raw"];
-			}
+	cookCondition: function(cookValue,volume){
+		var multiplier = 1;
+		if (cookValue>=multiplier*600000) {
+			return ["Fire", (cookValue-600000)/(multiplier*600000),"fire"];
 		}
-		else{
-			var multiplier = 1;
-			if (cookValue>=multiplier*45000) { //
-				return ["Fire", (cookValue)/(multiplier*600000),"fire"];
-			}
-			else if(cookValue>=multiplier*35000){//
-				return ["Burnt", (cookValue)/(multiplier*45000), "burnt"];
-			}
-			else if (cookValue>=multiplier*25000){ // 
-				return ["Dry", (cookValue)/(multiplier*35000), "dry"];
-			}
-			else if (cookValue>=multiplier*22000){ //
-				return ["Cooked", (cookValue)/(multiplier*25000), "overcooked"];
-			}
-			else if (cookValue>=multiplier*12000){ //
-				return ["Cooked", (cookValue)/(multiplier*22000), "cooked"];
-			}
-			else if (cookValue>=multiplier*7000){ //
-				return ["Undercooked", (cookValue)/(multiplier*12000), "slightly cooked"];
-			}
-			else if (cookValue>=multiplier*3000) {
-				return ["Undercooked", (cookValue)/(multiplier*7000), "undercooked"];
-			}
-			else {
-				return ["Raw", 1, "raw"];
-			}
-
+		else if(cookValue>=multiplier*250000) {
+			return ["Burnt", (cookValue-250000)/(multiplier*600000), "burnt"];
+		}
+		else if (cookValue>=multiplier*150000) {
+			return ["Dry", (cookValue-150000)/(multiplier*250000), "dry"];
+		}
+		else if (cookValue>=multiplier*85000){
+			return ["Cooked", (cookValue-12000)/(multiplier*150000), "overcooked"];
+		}
+		else if (cookValue>=multiplier*12000) {
+			return ["Cooked", (cookValue-12000)/(multiplier*150000), "cooked"];
+		}
+		else if (cookValue>=multiplier*10000){
+			return ["Undercooked", (cookValue-5000)/(multiplier*12000), "slightly cooked"];
+		}
+		else if (cookValue>=multiplier*5000) {
+			return ["Undercooked", (cookValue-5000)/(multiplier*12000), "undercooked"];
+		}
+		else {
+			return ["Raw", 1, "raw"];
 		}
 	}
 }
@@ -320,8 +322,8 @@ UtilityFunctions = {
 //Running the Program Stuff
 /*
 var ovenObject = new OvenModel();
-var turkey = new TurkeyModel(9, ovenObject);
+var turkey = new TurkeyModel(9.07185, ovenObject );
 
 globalTime=0;
-setInterval(function(){ovenObject.secondTick();},1000);
+setInterval(function(){ovenObject.secondTick();},10);
 */

js/screens.js

@@ -15,6 +15,7 @@ function LoadingScreen( stage, gameState ){
 	this.done.alpha= 0;
 	stage.addChild( this.picture );
 	stage.addChild( this.cooking );
+	stage.addChild( this.done );
 	stage.addChild( this.turkeyState[0] );
 
 	var textContent = new createjs.Text( "0 %", "25px Arial", "black" );
@@ -24,7 +25,7 @@ function LoadingScreen( stage, gameState ){
 
 	gameState.pubsub.subscribe( "Load", function(percent){
 		textContent.text = (percent * 25).toFixed(2) + " %";
-		var wholeNum = Math.floor(percent);
+		var wholeNum = percent.toFixed(0);
 		if( that.lastPercent != percent){
 			that.lastPercent = percent;
 			stage.addChild( that.turkeyState[wholeNum] );
@@ -51,7 +52,6 @@ function LoadingScreen( stage, gameState ){
 		}
 	});
 
-	stage.addChild( this.done );
 	stage.addChild( this.pictureFront );
 
 	return {
@@ -178,10 +178,8 @@ function DifficultyScreen( stage, gameState ){
                 }
             }
 
-            if( keynum != 8 && keynum < 91 && keynum > 47 && nameInput.text.length < 22 ){
+            if( keynum != 8 && keynum < 91 && keynum > 47 && nameInput.text.length < 22 )
             	nameInput.text += String.fromCharCode(keynum);
-            	gameState.name = nameInput.text;
-            }
     };
 
 
@@ -197,19 +195,19 @@ function DifficultyScreen( stage, gameState ){
                 }
             }
 
-            if(keynum == 8 && nameInput.text.length > 0 ){
+            if(keynum == 8 && nameInput.text.length > 0 )
             	nameInput.text = nameInput.text.substr(0, nameInput.text.length-1);
-            	gameState.name = nameInput.text;
-            }
         event.preventDefault();
     }
 
+    gameState.name = nameInput.text;
+
  	// Easy/Hard Button
  	stage.addChild( new Button( stage, gameState, 500, 235, 100, 55, "ChangeGender", "Male" ) );
  	stage.addChild( new Button( stage, gameState, 500, 300, 100, 55, "ChangeGender", "Female" ) );
 
- 	stage.addChild( new Button( stage, gameState, 503, 370, 200, 55, null, null, function(){ document.onkeyup = function(){}; gameState.hard = false; gameState.gameStarted = true; gameState.hardcoreModifier=1; gameState.pubsub.publish("SwitchScreen", "KitchenScreen"); } ) );
- 	stage.addChild( new Button( stage, gameState, 500, 495, 205, 55, null, null, function(){ document.onkeydown = function(){};  gameState.hard = true;  gameState.gameStarted = true; gameState.hardcoreModifier=20; gameState.pubsub.publish("SwitchScreen", "KitchenScreen"); } ) );
+ 	stage.addChild( new Button( stage, gameState, 503, 370, 200, 55, null, null, function(){ gameState.hard = false; gameState.gameStarted = true; gameState.hardcoreModifier=20; gameState.pubsub.publish("SwitchScreen", "KitchenScreen"); } ) );
+ 	stage.addChild( new Button( stage, gameState, 500, 495, 205, 55, null, null, function(){ gameState.hard = true;  gameState.gameStarted = true; gameState.hardcoreModifier=1; gameState.pubsub.publish("SwitchScreen", "KitchenScreen"); } ) );
 
  	stage.addChild( new Button( stage, gameState, 35, 495, 85, 55, "SwitchScreen", "MainScreen" ) );
 
@@ -405,7 +403,7 @@ function ScoreScreen( stage, gameState ){
     var totalScore = 0;
 
     var skinScoreChart  = {
-    	"raw": -1000,
+    	"raw": 0,
     	"undercooked": -100,
     	"slightly cooked": 75,
     	"cooked": 500,
@@ -417,9 +415,9 @@ function ScoreScreen( stage, gameState ){
     var coreScoreChart  = {
     	"raw": 0,
     	"undercooked": 125,
-    	"slightly cooked": 600,
+    	"slightly cooked": 750,
     	"cooked": 1000,
-    	"overcooked": 750,
+    	"overcooked": 1000,
     	"dry": 400,
     	"burnt": 0
     };
@@ -441,28 +439,29 @@ function ScoreScreen( stage, gameState ){
 	};
 
 	// Temperature Score
-	var outerTemp = UtilityFunctions.C2F(turkeyState.skin.highest).toFixed(2);
+	var outerTemp = UtilityFunctions.C2F(turkeyState.skin.temp).toFixed(2);
 	var coreTemp = UtilityFunctions.C2F(turkeyState.core.temp).toFixed(2);
 
-	var outerTempScore = that.scoreDistribution( outerTemp, "skin" ) * 200;
+	var outerTempScore = that.scoreDistribution( outerTemp ) * 200;
 	var coreTempScore = that.scoreDistribution( coreTemp ) * 200;
 
 	totalScore += parseInt(skinScoreChart[ turkeyState.skin.cond[2]]);
-	totalScore += parseInt(coreScoreChart[ turkeyState.core.cond[2]]);
+	totalScore += parseInt(skinScoreChart[ turkeyState.core.cond[2]]);
 	totalScore += parseInt(outerTempScore.toFixed(0));
 	totalScore += parseInt(coreTempScore.toFixed(0));
 
+
 	resultsDialogue = [];
-	if (totalScore>=1800) {
+	if (totalScore>=2000) {
 		randomDiag = perfect;
 	}
-	else if (totalScore>=1400) {
+	else if (totalScore>=1200) {
 		randomDiag = great;
 	}
-	else if (totalScore>=1000) {
+	else if (totalScore>=625) {
 		randomDiag = average;
 	}
-	else if (totalScore>=400) {
+	else if (totalScore>=300) {
 		randomDiag = subPar;
 	}
 	else {
@@ -552,7 +551,7 @@ function ScoreScreen( stage, gameState ){
 		outerConditionText.x = 310;
 		outerConditionText.y = 320;
 
-		var coreConditionText = new createjs.Text( coreScoreChart[  turkeyState.core.cond[2] ], "20px Arial", "black" );
+		var coreConditionText = new createjs.Text( coreScoreChart[  turkeyState.skin.cond[2] ], "20px Arial", "black" );
 		coreConditionText.x = 310;
 		coreConditionText.y = 340;
 
@@ -593,13 +592,14 @@ function ScoreScreen( stage, gameState ){
 
 		// Modifiers
 		var turkeyMod = typeToMod[gameState.turkeyType];
-		var turkeyTypeModifierText = new createjs.Text( -1*((1-turkeyMod)*100).toFixed(0) + "%", "20px Arial", "black" );
+		var turkeyTypeModifierText = new createjs.Text( "+"+(Math.abs(turkeyMod-1)*100).toFixed(0) + "%", "20px Arial", "black" );
 		turkeyTypeModifierText.x = 310;
 		turkeyTypeModifierText.y = 437;
 
 		totalScore *= turkeyMod;
 
-		var stuffingTypeModifierText = new createjs.Text( -1*((1-gameState.stuffingTypeModifier)*100).toFixed(0)+"%" , "20px Arial", "black" );
+
+		var stuffingTypeModifierText = new createjs.Text( "+"+(Math.abs(gameState.stuffingTypeModifier-1)*100).toFixed(0)+"%" , "20px Arial", "black" );
 		stuffingTypeModifierText.x = 310
 		stuffingTypeModifierText.y = 457;
 
@@ -626,6 +626,8 @@ function ScoreScreen( stage, gameState ){
 		stage.addChild( turkeyTypeModifierText );
 		stage.addChild( frillsModifierText );
 		stage.addChild( hardcoreModifierText );
+
+
 	}} );
 
 

js/soundmanager.js

@@ -14,6 +14,7 @@ function SoundManager( gameState ){
 	// Register all sounds loaded in gameState
 	createjs.Sound.registerSound("res/sound/turkey_in_the_straw.mp3", "TitleMusic");
 	createjs.Sound.registerSound("res/sound/Store/Waterford.mp3", "MarketMusic");
+	createjs.Sound.registerSound("res/sound/GUI/lowclick.mp3", "LowClick");
 	createjs.Sound.registerSound("res/sound/GUI/click.mp3", "Click");
 	createjs.Sound.registerSound("res/sound/GUI/buzz.mp3", "Error");
 	createjs.Sound.registerSound("res/sound/Store/buy.mp3", "Buy");
@@ -26,7 +27,7 @@ function SoundManager( gameState ){
 	createjs.Sound.registerSound("res/sound/Kitchen/Oven_Door_Full_Close.mp3", "Oven_Door_Full_Close");
 	createjs.Sound.registerSound("res/sound/Kitchen/Oven_Door_Peek_Close.mp3", "Oven_Door_Peek_Close");
 	createjs.Sound.registerSound("res/sound/Kitchen/Oven_Door_Peek_Open.mp3", "Oven_Door_Peek_Open");
-	createjs.Sound.registerSound("res/sound/Kitchen/Explosion_Sound.mp3", "Explosion");
+	createjs.Sound.registerSound("res/sound/Kitchen/sizzle.mp3", "Sizzle");
 
 	createjs.Sound.registerSound("res/sound/Kitchen/Open_Cookbook.mp3", "Open_Cookbook");
 	createjs.Sound.registerSound("res/sound/Kitchen/Close_Cookbook.mp3", "Close_Cookbook");

js/stories.js

@@ -5,7 +5,7 @@ var messages = {
 	"NoMoney" : ["Me: I can't afford this!"],
 	"BuyTurkeyFirst" : ["Me: I should buy a turkey first!"],
 	"EmptyOven" : ["Me: I'll start cooking once I get a turkey."],
-	"OpenDoor" :["Me: I should probably try opening the oven door to measure the turkey's temperature."]
+	"OpenDoor" :["Me: I should probably try opening the oven door to measure the turkey's temperature"]
 }
 
 //Terrible Results
@@ -17,7 +17,7 @@ var terrible = [
 "Mom: No thanks, I'm actually a vegetarian.",
 "Brother: Who taught you how to cook?",
 "Brother: What an awful turkey.",
-"Spouse: I'm leaving you honey. It's not you, its the turkey.",
+"Girlfriend: I'm leaving you honey. It's not you, it's the turkey.",
 "Cat: Meow Meow (Get out of my house!)"];
 
 //Subpar Results
@@ -33,8 +33,8 @@ var subPar = [
 "Mom: Honey, I think this turkey could have turned out better.",
 "Brother: Uhh, What's for dessert?",
 "Brother: We should get a pre-baked turkey next time.",
-"Spouse: Hey, the cat seems to like it.",
-"Spouse: We'll have to go to some cooking classes together.",
+"Girlfriend: Hey, the cat seems to like it.",
+"Girlfriend: We'll have to go to some cooking classes together.",
 "Cat: Hisssssss"];
 
 //Average Results
@@ -44,7 +44,7 @@ var average = [
 "Dad: Pretty decent turkey have you cooked here.",
 "Mom: Tastes better than store cooked turkeys.",
 "Brother: This is way better than I expected.",
-"Spouse: Not bad.",
+"Girlfriend: Not bad.",
 "Cat: Meow meow (I may not leave a present in your shoes today)"];
 
 //Great Results
@@ -55,9 +55,9 @@ var great = [
 "Grandma: Most enjoyable dinner. Now, who wants baked apples?",
 "Dad: Good and meaty, mmm-mmm!",
 "Mom: The second best turkey I have ever had!",
-"Mom: You should teach me your secrets",
+"Mom: You should teach me your secrets.",
 "Brother: Way to go, this turkey is fantastic.",
-"Spouse: Oh, what a nice turkey.",
+"Girlfriend: Oh, what a nice turkey.",
 "Cat: Meow MEOW! (I am pleased, human)"];
 
 //Perfect Results
@@ -68,8 +68,8 @@ var perfect = [
 "Mom: This turkey is delicious. Let's get you two wed immediately!",
 "Mom: Never have I had a more scrumptious turkey!",
 "Brother: All-praise the turkeymeister!",
-"Spouse: Bite after bite of gourmet delight!",
-"Spouse: We should get married. Tonight!",
+"Girlfriend: Bite after bite of gourmet delight!",
+"Girlfriend: We should get married. Tonight!",
 "Cat: Puuuurrrrrrr"];
 
 
@@ -250,65 +250,65 @@ var story = {
 "Grandma: No, not taking a taxi out to dinner. Forget it. Just forget it."],
 
 "Girlfriend's Boba Keeps on a-flowing":
-["Spouse: You know what boba is right Mom?",
+["Girlfriend: You know what boba is right Mom?",
 "Mom: What's Boba?",
-"Spouse: Ok, I guess not.",
+"Girlfriend: Ok, I guess not.",
 "Grandma: What's booba?",
-"Spouse: I take it you mean boba?",
+"Girlfriend: I take it you mean boba?",
 "Grandma: Yes, that thing.",
-"Spouse: What most people talk about when they mean 'boba' are tea drinks with milk in them.",
-"Spouse: The boba tea drinks are not hard to make, just make black tea, and then add any kind of milk you have, some sweetener, then chill with ice.",
-"Spouse: [Player] and I made it at home one time, but that's another story. Anyways, the 'boba' itself are these little black balls that are made out of sweet potato.",
+"Girlfriend: What most people talk about when they mean 'boba' are tea drinks with milk in them.",
+"Girlfriend: The boba tea drinks are not hard to make, just make black tea, and then add any kind of milk you have, some sweetener, then chill with ice.",
+"Girlfriend: [Player] and I made it at home one time, but that's another story. Anyways, the 'boba' itself are these little black balls that are made out of sweet potato.",
 "Dad: Sweet Potatoes, like a yam?",
 "Brother: Dad, you know that sweet potatoes and yams are not the same right?",
 "Dad: What? They aren't?",
 "Brother: No",
 "Dad: Well, what's the difference?",
 "Brother: I don't know, but the point is they are different.",
-"Spouse: Boba is usually made from sweet potatoes, but it can also be made from other starchy materials, I suppose.",
+"Girlfriend: Boba is usually made from sweet potatoes, but it can also be made from other starchy materials, I suppose.",
 "Dad: What's it taste like? Kind of...potatoey?",
-"Spouse: Not really, it is chewy, a bit like... when you take the first bite into some gum. Right before it gets soft.",
-"Spouse: Though when places heat it up, it is really soft and moldable.",
+"Girlfriend: Not really, it is chewy, a bit like... when you take the first bite into some gum. Right before it gets soft.",
+"Girlfriend: Though when places heat it up, it is really soft and moldable.",
 "Grandma: Hmm. I wouldn't mind trying this boba sometime.",
-"Spouse: You definitely should since I know you like your morning tea.",
-"Spouse: Now that you all know what boba is, I can tell you about this cool, and somewhat awkward event that happened.",
-"Spouse: [Player] and I were driving down the freeway when we remembered that a new boba place was opening up on Teller St.",
-"Spouse: As part of their opening promotion, they were offering one free boba drink per customer.",
-"Spouse: Since I was thirsty, I suggested we drop by and see what's up.",
-"Spouse: We parked and walk up to the building. There weren't too many people about, and a sign revealed why.",
-"Spouse: The free boba promotion ended at 8PM, and it was already 10!",
+"Girlfriend: You definitely should since I know you like your morning tea.",
+"Girlfriend: Now that you all know what boba is, I can tell you about this cool, and somewhat awkward event that happened.",
+"Girlfriend: [Player] and I were driving down the freeway when we remembered that a new boba place was opening up on Teller St.",
+"Girlfriend: As part of their opening promotion, they were offering one free boba drink per customer.",
+"Girlfriend: Since I was thirsty, I suggested we drop by and see what's up.",
+"Girlfriend: We parked and walk up to the building. There weren't too many people about, and a sign revealed why.",
+"Girlfriend: The free boba promotion ended at 8PM, and it was already 10!",
 "Mom: Aww, that's too bad",
-"Spouse: I decided to get a drink anyways.",
-"Spouse: But when I ordered, the worker said 'Would you like to try one of our free drinks?', and motioned towards the sign.",
-"Spouse: 'Sure!', Then he asked [Player] what [GenderPronoun] wanted.",
-"Spouse: So we both got a full-sized free drink!",
+"Girlfriend: I decided to get a drink anyways.",
+"Girlfriend: But when I ordered, the worker said 'Would you like to try one of our free drinks?', and motioned towards the sign.",
+"Girlfriend: 'Sure!', Then he asked [Player] what [GenderPronoun] wanted.",
+"Girlfriend: So we both got a full-sized free drink!",
 "Mom: What flavor did you get? I assume there are flavors of boba?",
-"Spouse: Yes, there are. I ordered Strawberry. It tasted ok, but was really missing that strawberry flavor.",
-"Spouse: The worker asked how they were, and well Mom, you raised me to be an honest individual, so it was lacking in flavor.",
-"Spouse: So the worker says, 'Alright, let me make you another one'",
-"Spouse: He makes me a completely new boba drink, while letting me keep the old one to drink. At this point I haven't even paid for anything yet.",
+"Girlfriend: Yes, there are. I ordered Strawberry. It tasted ok, but was really missing that strawberry flavor.",
+"Girlfriend: The worker asked how they were, and well Mom, you raised me to be an honest individual, so it was lacking in flavor.",
+"Girlfriend: So the worker says, 'Alright, let me make you another one'",
+"Girlfriend: He makes me a completely new boba drink, while letting me keep the old one to drink. At this point I haven't even paid for anything yet.",
 "Dad: That's just good customer service. Since this place is new, he is trying to build up customer relations.",
-"Spouse: True, but I feel like it got a little out of hand. The next drink also lacked the strawberry flavor. The worker said it is probably because of the syrup.",
-"Spouse: He then proceeded to make another drink, still free, using fresh strawberries in lieu of the syrup flavoring.",
-"Spouse: Now the syrup drinks were probably really cheap to make, but making drinks with real fruit costs considerably more.",
-"Spouse: By the end of our time at the place, the two of us had six drinks in hand without a cent spent.",
-"Spouse: The worker just kept offering us samples and I felt really guilty about being so honest.",
-"Spouse: I decided to order the drink I was originally going to get, even though I had consumed 2 whole boba drinks already. Sugar overload!",
+"Girlfriend: True, but I feel like it got a little out of hand. The next drink also lacked the strawberry flavor. The worker said it is probably because of the syrup.",
+"Girlfriend: He then proceeded to make another drink, still free, using fresh strawberries in lieu of the syrup flavoring.",
+"Girlfriend: Now the syrup drinks were probably really cheap to make, but making drinks with real fruit costs considerably more.",
+"Girlfriend: By the end of our time at the place, the two of us had six drinks in hand without a cent spent.",
+"Girlfriend: The worker just kept offering us samples and I felt really guilty about being so honest.",
+"Girlfriend: I decided to order the drink I was originally going to get, even though I had consumed 2 whole boba drinks already. Sugar overload!",
 "Brother: I hope you left him a fat tip for his troubles.",
-"Spouse: Yes, I tipped, [Player] made sure of that.",
-"Spouse: With all the caffeine and sugar, I couldn't sleep all night. My heart was in trepidation even through the next morning.",
-"Spouse: I probably wouldn't do that again.",
+"Girlfriend: Yes, I tipped, [Player] made sure of that.",
+"Girlfriend: With all the caffeine and sugar, I couldn't sleep all night. My heart was in trepidation even through the next morning.",
+"Girlfriend: I probably wouldn't do that again.",
 "Grandma: This sounds like the place I should try my first boba.",
-"Spouse: I don't think I could boba for at least a month I'm so burnt out.",
+"Girlfriend: I don't think I could boba for at least a month I'm so burnt out.",
 "Brother: It is settled, right after this meal we're all going out for boba.",
-"Spouse: Hah, no.",
+"Girlfriend: Hah, no.",
 "Brother: No, seriously.",
-"Spouse: And seriously. No"],
+"Girlfriend: And seriously. No"],
 
 
 "Grandmother reveals the virtues of the bread line":
 ["Brother: The Turkey is taking a while to cook. [Player] isn't too good at cooking is [GenderPronoun]?",
-"Spouse: How dare you talk about [Player] like that. [Player] is a great cook. You'll see!",
+"Girlfriend: How dare you talk about [Player] like that. [Player] is a great cook. You'll see!",
 "Grandma: You guys have it lucky. Where I grew up we had bread lines.",
 "Grandma: My family would stand in a bread line for over six hours with the POSSIBILITY of receiving a loaf of bread.",
 "Grandma: I remember one particular occasion where my mom told me to take my baby sister with me and go stand in the bread line.",
@@ -327,7 +327,7 @@ var story = {
 "Dad: It wasn't a meeting, it was closer to a seminar.",
 "Dad: At work, we accrue credits that can be put towards educational events. Our managers think that an educated workforce is a happy and productive workforce.",
 "Dad: So we are required to spend these credits every year on our choice of relevant education events.",
-"Spouse: That's cool. What kind of choices for educational events are there?",
+"Girlfriend: That's cool. What kind of choices for educational events are there?",
 "Dad: As one example, employees can go to a local college or high school and present about their work at the company.",
 "Dad: Other options are to attend talks about various topics, such as aerospace engineering, materials science, manager relations, customer relations, etc.",
 "Dad: I decided to spend my credits on a five person panel from the various automotive manufacturers about the future of automated vehicles.",
@@ -350,10 +350,10 @@ var story = {
 
 "Brother recounts a hockey game he saw recently, and his friend has to go to the hospital":
 ["Brother: Yo, I watched a hockey game recently. There were cheap group tickets, so a bunch of my friends jumped on it to watch the game.",
-"Spouse: Who was playing?",
+"Girlfriend: Who was playing?",
 "Brother: Some minor league team, the 'Raging Tornados', I believe?  It isn't important. The point is seeing two teams pummel each other over a little puck.",
 "Grandpa: Yes, exactly!",
-"Spouse: I suppose since we're glorifying the violence of the sport, were there any fights?",
+"Girlfriend: I suppose since we're glorifying the violence of the sport, were there any fights?",
 "Brother: Ah hell yeah! The gloves were thrown to the ice, and the two players starting man-hugging each other.",
 "Brother: The refs just let it go. There was no blood, but it was the intention that mattered.",
 "Brother: Sadly, it isn't like some video games where the winner of the fight gets to stay on the ice. The perpetrator in this case got the penalty.",
@@ -367,7 +367,7 @@ var story = {
 "Brother: Yeah, they were fine. They decided to go home however. Too much trauma. They would be flinching with every one-timer during the game.",
 "Mom: Aww, that's a shame. It wasn't Charles was it? Poor Charles...",
 "Brother: No, Mom, Charles is fine.",
-"Spouse: Close game?",
+"Girlfriend: Close game?",
 "Brother: Hardly. 3-0",
 "Brother: The tornado mascot kept it interesting though, with his kazoo.",
 "Brother: 'Bzzzwoooooo'",
@@ -389,16 +389,16 @@ var story = {
 "Brother: But, it was definitely a lot of fun to watch."],
 
 "Mom talks about her students and reading over summer vacation":
-["Spouse: Well Mom, how are your students doing?",
+["Girlfriend: Well Mom, how are your students doing?",
 "Mom: Thank you for asking. They are doing well.",
 "Brother: Still teaching the third grade?",
 "Mom: Yessum",
-"Spouse: Soo, lay on the juicy stories.",
+"Girlfriend: Soo, lay on the juicy stories.",
 "Mom: Mmmm, well, for the winter break coming up I'm planning on having them read 'The BFG'.",
-"Spouse: oooh, I liked that book.",
+"Girlfriend: oooh, I liked that book.",
 "Brother: Mom, winter break reading is THE reason that students hate their teachers. Can't you let them enjoy their break in peace?",
 "Mom: But reading is fundamental. We can't let our students forget what they learned.",
-"Spouse: It isn't that bad, 'The BFG' is a fun and entertaining book.",
+"Girlfriend: It isn't that bad, 'The BFG' is a fun and entertaining book.",
 "Brother: Granted, but forcing one to read kills their love of reading. It did for me.",
 "Brother: After I began reading for fun rather than the school forcing me to do it, I could really appreciate the work for what they are.",
 "Mom: Greg, you are right. But you have to remember that if we don't force kids to do a little reading, they may not do the reading at all.",
@@ -427,10 +427,10 @@ var story = {
 "Brother: Whaat? I'm named after your former lover?! Did you know about this Dad?!",
 "Dad: Yes, but what's the big deal? I still like the name Greg. It's a good strong name.",
 "Brother: I don't think I'll be able to think about my name the same way ever again.",
-"Spouse: Hah ha brother. Sucks to be you. Hah ha!",
-"Spouse: But please Mom and Dad, don't tell ever me how I got my name.",
+"Girlfriend: Hah ha brother. Sucks to be you. Hah ha!",
+"Girlfriend: But please Mom and Dad, don't tell ever me how I got my name.",
 "Mom: Ooh, but your name origin is quite special.",
-"Spouse: La la la, I'm not listening!"],
+"Girlfriend: La la la, I'm not listening!"],
 
 "Grandparents sings a Patriotist song":
 ["Grandpa: Since dinner is taking a while, it seems like a good time for a song don't you think?",
@@ -443,11 +443,11 @@ var story = {
 "Grandpa: And he said 'hey don't do that to me' ",
 "Grandpa: So I took it on home to my mother in law",
 "Grandpa: She threw me outside with the Turkey in the Straw",
-"Grandma: Oooooh Adolf Hitler grabbed a tail,",
-"Grandma: And he hung right on with tooth and nail,",
-"Grandma: and he saw what he had and he began to swear,",
-"Grandma: On the end of the tail was a Russian bear,",
-"Grandpa: The old bear growled and started in to shake,",
+"Grandma: Oooooh Adolf Hitler grabbed a tail, ",
+"Grandma: And he hung right on with tooth and nail, ",
+"Grandma: And he saw what he had and he began to swear, ",
+"Grandma: On the end of the tail was a Russian bear, ",
+"Grandpa: The old bear growled and started in to shake, ",
 "Grandma: Adolf knew he'd made a big mistake.",
 "Grandpa: He tried to hang on and he tried to let go ",
 "Grandma: Now they have a new dance called Hitler in the snow. ",
@@ -459,22 +459,22 @@ var story = {
 ["Dad: Hey guys, what's the key to a great Thanksgiving dinner?",
 "Mom: Of course it is the loving family?",
 "Brother: I bet it is the pillowy mounds of mashed potatoes.",
-"Spouse: It is the turkey right?",
+"Girlfriend: It is the turkey right?",
 "Dad: That's right, its the turKEY",
 "Dad: turKEY, get it?",
-"Spouse: What?",
+"Girlfriend: What?",
 "Dad: The KEY to a great thanksgiving dinner is the turKEY.",
-"Spouse: Aww, come on Dad. That's terrible.",
+"Girlfriend: Aww, come on Dad. That's terrible.",
 "Grandma: Is this a joke?",
 "Dad: Yes Mom,",
 "Grandma: Well, what do you mean 'key'.",
-"Dad: 'Key', as in, characteristic, identifying.",
+"Dad: A 'key', something that is of vital importance.",
 "Grandma: hmmm, ok. I think I get it.",
 "Dad: Ok...."],
 
 "Mom Butter Story":
 ["Mom: My favorite color is butter.",
-"Spouse: That's cool."],
+"Girlfriend: That's cool."],
 
 "Cat Story":
 ["Cat: Meow Meow Meow Meow Meow",
@@ -509,7 +509,7 @@ var story = {
 "Mom: But then the administration told me that all students were required to have a bathroom pass. Too many students were skipping class they feared.",
 "Mom: I never lost a student and all my students knew not to abuse their privileges, but I did as I was told.",
 "Mom: I made sure students signed themselves out, wrote their name, signed it, then took the bathroom pass.",
-"Spouse: That seems very efficient. But are the third graders mature enough to get themselves to the bathroom and not goof off?",
+"Girlfriend: That seems very efficient. But are the third graders mature enough to get themselves to the bathroom and not goof off?",
 "Mom: Well, every student has their 20 minutes. I don't want to parent them. That's not my job. My job is to teach lessons.",
 "Mom: It seemed to work well. None of my students abused the system.",
 "Mom: But it seemed the administration didn't appreciate the system. They changed the rules once again.",
@@ -553,35 +553,35 @@ var story = {
 "Grandpa: Field medics couldn't get all the pieces out, and we were at least two days away from a decent hospital.",
 "Grandpa: The ear got infected and Jimmy lost his hearing soon after.",
 "Grandpa: 'Bug Brain' we used to call him. Great guy.",
-"Spouse: I'm sorry to hear that.",
+"Girlfriend: I'm sorry to hear that.",
 "Grandpa: Can't undo the past. Those dang bugs were everywhere though.",
 "Mom: Gross, Gross, Gross. ",
 "Grandpa: It isn't that bad. Be grateful I didn't tell you the story where we ate them. Not bad. A little crunchy. Not as good as turkey though.",
 "Mom: !!!"],
 
-"Story about Spouse's teacher that makes buzzer noises when you got something wrong":
-["Spouse: Greg, here's something that might tinkle your fancy.",
-"Spouse: I saw my old professor from a couple years back, Professor Ronfleur. The Humanities teacher. Do you remember him?",
+"Story about Girlfriend's teacher that makes buzzer noises when you got something wrong":
+["Girlfriend: Greg, here's something that might tinkle your fancy.",
+"Girlfriend: I saw my old professor from a couple years back, Professor Ronfleur. The Humanities teacher. Do you remember him?",
 "Brother: The guy who always wore the purple bow tie? Who could forget him? Did he buzz you?",
-"Spouse: Ha-ha, no, but that's why I brought it up. That buzz!",
+"Girlfriend: Ha-ha, no, but that's why I brought it up. That buzz!",
 "Mom: What buzz?",
-"Spouse: I guess we never told you Mom. Remember when we took that humanities class at the local community college during the summer?",
-"Spouse: We were trying to get the lower division English requirements out the way so could take classes at college that were actually worth our time.",
-"Spouse: This Professor Ronfleur used to make a buzzing sound whenever anybody got something wrong.",
-"Spouse: 'In what way does Aristotle disagree with Plato's Allegory of the Cave?' and then...",
-"Spouse: BRRZZZZZZZT!",
-"Spouse: He would make this super nasally buzzing noise.",
+"Girlfriend: I guess we never told you Mom. Remember when we took that humanities class at the local community college during the summer?",
+"Girlfriend: We were trying to get the lower division English requirements out the way so could take classes at college that were actually worth our time.",
+"Girlfriend: This Professor Ronfleur used to make a buzzing sound whenever anybody got something wrong.",
+"Girlfriend: 'In what way does Aristotle disagree with Plato's Allegory of the Cave?' and then...",
+"Girlfriend: BRRZZZZZZZT!",
+"Girlfriend: He would make this super nasally buzzing noise.",
 "Brother: Seriously! Whenever I see the guy, I can just imagine pressing his bow tie and a buzzing noise coming out.",
-"Spouse: And he did it ALL. THE. TIME.",
+"Girlfriend: And he did it ALL. THE. TIME.",
 "Brother: Yeah! Did he say anything to you when he saw you?",
-"Spouse: I said hello and introduced myself, but he didn't know me. Just gave me the glazed ham eye look.",
+"Girlfriend: I said hello and introduced myself, but he didn't know me. Just gave me the glazed ham eye look.",
 "Brother: Glazed ham?",
-"Spouse: For Thanksgiving.",
+"Girlfriend: For Thanksgiving.",
 "Brother: He gave you the glazed turkey look.",
-"Spouse: Exactly."],
+"Girlfriend: Exactly."],
 
 "Brother's Fiancee is on Business Trip":
-["Mom: Greg, where's your fiancee? Why didn't you invite her over for Thanksgiving dinner?",
+["Mom: Greg, where's your fiancée? Why didn't you invite her over for Thanksgiving dinner?",
 "Brother: I did invite her, but she couldn't make it. She is on a business trip and could not get the time off.",
 "Mom: A business trip on Thanksgiving? But Thanksgiving only happens once per year! This is the perfect time to rekindle the spirit of family.",
 "Brother: I know Mom, but Thanksgiving doesn't happen everywhere, and her job in sales demands that she travel abroad to meet with potential clients in person.",
@@ -592,8 +592,8 @@ var story = {
 "Brother: uh, well yeah, sure Mom. You can come and visit.",
 "Grandpa: What!? I want to come and see your new place too.",
 "Brother: Sure...yeah ok.",
-"Spouse: You aren't going to invite me?",
-"Brother: Yes, definitely. Everyone can come and visit. Just... I don't want to stress out my fiancee when she comes home.",
+"Girlfriend: You aren't going to invite me?",
+"Brother: Yes, definitely. Everyone can come and visit. Just... I don't want to stress out my fiancée when she comes home.",
 "Brother: She likes to relax at home.",
 "Mom: Don't worry honey, we won't stress her out. I'll make her my delicious breakfast omelet.",
 "Grandpa: And I'll tell her my war stories.",
@@ -612,7 +612,7 @@ var story = {
 "Cat: Meow meow meow! The oven is doing that quite nicely.",
 "Turkey: Ga-Gobble!",
 "Cat: Meow Meow",
-"Dad: Aww Kasey, aren't you a cute little kitty."],
+"Dad: Aww Kasey, can't you a cute little kitty."],
 
 "Turkey Fact - Wattle":
 ["Turkey: Hey, it is time for another turkey fact.",

js/ui.js

@@ -51,17 +51,16 @@ function HelpUI( stage, gameState ){
 		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP1P2.png"),
 		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP3P4.png"),
 		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP5P6.png"),
-		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP7P8.png"),
-		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP9P10.png")
+		new createjs.Bitmap("res/screens/HelpCreditsScreen/HelpP7P8.png")
 	];
-	var position = 100;
+	var position = 0;
 	var helpImg = helpPages[0];
 	var closeButton = new Button( stage, gameState, 708, 8, 80, 50,null, null, function(){ that.hideHelp(); } );
 	var nextButton = new Button( stage, gameState, 645, 543, 80, 50, null,null, function(){ gameState.pubsub.publish("Play", "Open_Cookbook");
 		if( helpImg ){
 			position++;
 			helpImg.visible = false;
-			helpImg = helpPages[ Math.abs(position) % 5 ];
+			helpImg = helpPages[ position % 4 ];
 			helpImg.visible = true;
 		} else{
 			that.hideHelp();
@@ -71,7 +70,7 @@ function HelpUI( stage, gameState ){
 		if( helpImg ){
 			position--;
 			helpImg.visible = false;
-			helpImg = helpPages[ Math.abs(position) % 5 ];
+			helpImg = helpPages[ Math.abs(position) % 4 ];
 			helpImg.visible = true;
 		} else {
 			that.hideHelp();
@@ -177,8 +176,6 @@ function DeathUI(stage, gameState){
 
 	// Show core temperature
 	this.showDeath = function(){
-		gameState.pubsub.publish( "Play", {name:"Explosion", volume:1} );
-
 		stage.addChild( finalImg );
 	 	animation.gotoAndPlay("boom");
 	 	stage.addChild( deathCount );
@@ -270,10 +267,6 @@ function CookbookUI( stage, gameState ){
 
 	var cookbookImg = new createjs.Bitmap("res/screens/KitchenScreen/Cookbook-Open.png");
 	var closeButton = new Button( stage, gameState, 710, 10, 100, 50, null, null, function(){that.hideCookbook();} );
-
-	var scrollUpBtn = new Button( stage, gameState, 710, 80, 100, 50, null, null, function(){that.scrollUp();} );
-	var scrollDownBtn = new Button( stage, gameState, 710, 540, 100, 50, null, null, function(){that.scrollDown();} );
-
 	var turkeyTypeText = new createjs.Text("", "18px Arial", "black" );
 	turkeyTypeText.x = 535;
 	turkeyTypeText.y = 56;
@@ -281,63 +274,24 @@ function CookbookUI( stage, gameState ){
 	var turkeyWeightText = new createjs.Text("", "18px Arial", "black" );
 	turkeyWeightText.x = 553;
 	turkeyWeightText.y = 85;
-	var hiddenEntries = [];
-	var logEntries = [];
 
+	var logEntries = [];
 	this.hideCookbook = function(){
 
 		stage.removeChild( closeButton );
 		stage.removeChild( cookbookImg );
-		stage.removeChild( scrollUpBtn );
-		stage.removeChild( scrollDownBtn );
 		stage.removeChild( turkeyTypeText );
-		stage.removeChild( turkeyWeightText );
+		stage.removeChild(turkeyWeightText);
 		for( i in logEntries ){
 			stage.removeChild(logEntries[i]);
 		}
-
-		for( i in hiddenEntries ){
-			stage.removeChild(hiddenEntries[i]);
-		}
-
 		that.showingCookbook = false;
 		gameState.pubsub.publish("Play", "Close_Cookbook");
 	}
 
-	this.scrollDown = function(){
-
-		// move to hidden list
-		if( logEntries.length > 1 ){
-			// Move all entries up by 50 pixels
-			for( i in logEntries ){
-				logEntries[i].y -= 50;
-			}
-			var topEntry = logEntries.shift();
-			topEntry.alpha = 0;
-			hiddenEntries.push( topEntry );
-		}
-	}
-
-
-	this.scrollUp = function(){
-		// pop and fill in top
-		if( hiddenEntries.length > 0 ){
-			var topEntry = hiddenEntries.pop();
-			topEntry.alpha = 1;
-			logEntries.unshift( topEntry );
-
-			// shift everything down by 50 pixels
-			for( i in logEntries ){
-				logEntries[i].y += 50;
-			}
-		}
-	}
-
 	// Show core temperature
 	this.showCookbook = function(){
 		if( !that.showingCookbook ){
-			// TODO: So this object is actually persistent: we should not remove/add children, just hide stuff visually
-			logEntries = [];
 			stage.addChild( cookbookImg );
 			stage.addChild( closeButton );
 
@@ -357,13 +311,9 @@ function CookbookUI( stage, gameState ){
 				logEntries.push(logLine);
 				stage.addChild(logLine);
 			}
-
 			stage.addChild(turkeyTypeText);
 			stage.addChild(turkeyWeightText);
 
-			stage.addChild(scrollUpBtn);
-			stage.addChild(scrollDownBtn);
-
 			that.showingCookbook = true;
 		}
 	}
@@ -520,11 +470,9 @@ function OvenUI( stage, gameState ){
 
 			if( gameState.turkeyBought ){
 				var state = gameState.ovenModel.getTurkeyState();
-				if(!evalSkin[turkeyState["skin"]["cond"][2]])
-					gameState.pubsub.publish("Death","");
 				gameState.pubsub.publish( "ShowDialog", {seq:"custom", autoAdvance:true, customText:evalSkin[turkeyState["skin"]["cond"][2]] + "." } );
 				gameState.pubsub.publish( "AddRecord", {type:"Open ", text:"The turkey looked " + turkeyState["skin"]["cond"][2]} );
-				gameState.ovenModel.setRawTemp( (gameState.ovenModel.getRawTemp() - 3 ) < 20 ? 20 : gameState.ovenModel.getRawTemp() - 3 );
+				//gameState.ovenModel.setRawTemp( (gameState.ovenModel.getRawTemp() - 25) < 150 ? 150 : gameState.ovenModel.getRawTemp() - 25 );
 				gameState.ovenOpened++;
 			}
 
@@ -554,8 +502,6 @@ function OvenUI( stage, gameState ){
 			handleBar.y = 48;
 			if( gameState.turkeyBought ){
 				var state = gameState.ovenModel.getTurkeyState();
-				if(!evalSkin[turkeyState["skin"]["cond"][2]])
-					gameState.pubsub.publish("Death","");
 				gameState.pubsub.publish( "ShowDialog", {seq:"custom", autoAdvance:true, customText:evalSkin[turkeyState["skin"]["cond"][2]] } );
 				gameState.pubsub.publish( "AddRecord", {type:"Peek ", text:"The turkey looked " +turkeyState["skin"]["cond"][2]} );
 			}
@@ -596,15 +542,8 @@ function OvenUI( stage, gameState ){
 
     this.secondTick = function(diff){
     		// check if oven door is open
-    		if( that.ovenDoor == OVEN_OPEN ){
-    			gameState.ovenModel.setRawTemp( (gameState.ovenModel.getRawTemp() - 1 ) < 20 ? 20 : gameState.ovenModel.getRawTemp() - 1 );
-    		}
-
     		gameState.ovenModel.secondTick();
     		gameState.currentTime += diff;
-    		if( gameState.turkeyBought ){
-				gameState.turkeyCookCounter++;
-			}
 	}
 
 	gameState.pubsub.subscribe( "SkipTime", function(){
@@ -626,6 +565,7 @@ function OvenUI( stage, gameState ){
     			that.secondTick( diff );
 
 	    		if( gameState.turkeyBought ){
+					gameState.turkeyCookCounter++;
 					// what's the state of the turkey
 					turkeyState = gameState.ovenModel.getTurkeyState();
 					gameState.turkeyStates[0].alpha = 1;
@@ -642,7 +582,7 @@ function OvenUI( stage, gameState ){
 				}
 				gameState.oldTime = Date.now();
 			}
-			if( gameState.turkeyBought && dialoguediff > 2*60*1000 ){
+			if( gameState.turkeyBought && dialoguediff > 5*60*1000 ){
 					gameState.pubsub.publish( "ShowDialog", {seq:"Spouse gets surprise movie tickets", autoAdvance:true, random:true} );
 					gameState.oldDialogueTime = Date.now();
 			}
@@ -685,10 +625,6 @@ function OvenUI( stage, gameState ){
 			//finalize button
 			if( gameState.turkeyBought ){
 				stage.addChild( new Button( stage, gameState, 45, 250, 250, 150, null, null, function(){
-					if(!evalSkin[turkeyState["skin"]["cond"][2]]){
-						gameState.pubsub.publish("Death","");
-						return;
-					}
 					gameState.pubsub.publish("Play", "Error");
 					gameState.pubsub.publish("ShowFinalConfirm","");
 				} ) );
@@ -720,140 +656,68 @@ function OvenUI( stage, gameState ){
 
 function WindowUI( stage, gameState ){
 
-	var dayNight = new createjs.Bitmap("res/screens/Window/Test4-217.png");
-	var mood = new createjs.Bitmap("res/screens/Window/Test4TransparencyFull.png");
-
- 	var smallWindows= [ new createjs.Bitmap("res/screens/Window/Small1.png"),
- 			  	 	   	new createjs.Bitmap("res/screens/Window/Small2.png"),
- 				 	  	new createjs.Bitmap("res/screens/Window/Small3.png"),
- 				   		new createjs.Bitmap("res/screens/Window/Small4.png"),
- 				   		new createjs.Bitmap("res/screens/Window/Small5.png")
- 				 ];
-
- 	var windows= [ new createjs.Bitmap("res/screens/Window/Win1.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win2.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win3.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win4.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win5.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win6.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win7.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win8.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win9.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win10.png"),
- 				   new createjs.Bitmap("res/screens/Window/Win11.png")
- 				 ];
+	var dayNight = new createjs.Bitmap("res/screens/Window/Test4-217.svg");
+	var mood = new createjs.Bitmap("res/screens/Window/Test4TransparencyFull.svg");
 
 	mood.y=30;
 	dayNight.y=30;
 
 	var secondCounter = 0;
-	var newpos = -(new Date( gameState.currentTime ).getHours()*682.625);
-	mood.x = dayNight.x = newpos < -15583 ? 0 : newpos;
+	mood.x = dayNight.x = -(new Date( gameState.currentTime ).getHours()*682.625);
 
 	var ground = new createjs.Bitmap( "res/screens/Window/Ground.png" );
 	var houses = new createjs.Bitmap( "res/screens/Window/Housefar.png" );
 	var streetLight = new createjs.Bitmap( "res/screens/Window/StreetlightGlow.png" );
-	streetLight.alpha = 1;
-	var stars = new createjs.Bitmap( "res/screens/Window/Stars.png" );
-	stars.alpha = 1;
+	streetLight.alpha = 0;
 
-	var treeAnimations = { rustle:{ frames:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17], next:false } };
+	var treeAnimations = { rustle:[0,17,"rustle"], still:[0,0,"still"] };
 	var data = {
     	images: ["res/screens/Window/Tree_Animation.png"],
      	frames: { width:386, height:287 },
      	animations: treeAnimations
  	};
 	var spriteSheet = new createjs.SpriteSheet(data);
- 	var animation = new createjs.Sprite(spriteSheet);
+ 	var animation = new createjs.Sprite(spriteSheet, "treeAnimations");
  	animation.x = 415;
  	animation.y = 30;
 
 	// Fast forward, move sky
 	gameState.pubsub.subscribe( "SkipTime", function(){
 		var newpos =  -(new Date( gameState.currentTime ).getHours()*682.625);
-		 dayNight.x = mood.x = newpos < -15583 ? 0 : newpos;
+		 dayNight.x = mood.x =newpos < -15583 ? 0 : newpos;
 	});
 
     stage.addChild( dayNight );
     stage.addChild( ground );
     stage.addChild( houses );
-    stage.addChild( stars );
+    stage.addChild( streetLight );
     stage.addChild( animation );
     stage.addChild( mood );
-    
-
-    for( var i in smallWindows ){
-    	smallWindows[i].visible = UtilityFunctions.randRange(0,1);
-    	stage.addChild( smallWindows[i] );
-    }
-
-    for( var i in windows ){
-    	windows[i].visible = UtilityFunctions.randRange(0,1);
-    	stage.addChild( windows[i] );
-    }
-    stage.addChild( streetLight );
 return {
 
 	tick: function(){
 
 		// move the sky
 		secondCounter++;
-		if( secondCounter > 600 ){
+		if( secondCounter > 60 ){
 			dayNight.x-=11.38;
 			mood.x -= 11.38;
 			secondCounter = 0;
-
-			// move tree sometimes
-			if( UtilityFunctions.randRange(0,1) )
-				animation.gotoAndPlay("rustle");
-
-			// turn on lights
-			if( dayNight.x < 0 && dayNight.x > -4545 ){
-				for( var i in smallWindows ){
-					smallWindows[i].visible = UtilityFunctions.randRange(0,1);
-				}
-				for( var i in windows ){
-					windows[i].visible = UtilityFunctions.randRange(0,1);
-				}
-
-				// turn on random window lights
-				streetLight.alpha= 1;
-				stars.alpha = 1;
-			}
-			else if( dayNight.x < -11687 ){
-				for( var i in smallWindows ){
-					smallWindows[i].visible = UtilityFunctions.randRange(0,1);
-				}
-				for( var i in windows ){
-					windows[i].visible = UtilityFunctions.randRange(0,1);
-				}
-				streetLight.alpha= 1;
-				stars.alpha = 1;
-			}
-			// daytime, turn off all lights
-			else{
-				for( var i in smallWindows ){
-					smallWindows[i].visible = 0;
-				}
-				for( var i in windows ){
-					windows[i].visible = 0;
-				}
-
-				streetLight.alpha= 0;
-				stars.alpha = 0;
-			}
-		}
-
-		// if too many lights are causing an issue on your browser, turn them off
-		if( createjs.Ticker.getMeasuredFPS().toFixed(1) < 13 ){
-			for( var i in windows ){
-				windows[i].visible = 0;
-			}
 		}
 
 		if( dayNight.x < -15583 )
 			dayNight.x = 0;
 
+		// turn on lights
+		if( dayNight.x < 0 && dayNight.x > -4545 ){
+			// turn on random window lights
+			streetLight.alpha = 1;
+		}
+		else if( dayNight.x < -11687 ){
+			streetLight.alpha = 1;
+		}
+		else
+			streetLight.alpha = 0;
 	}
 }
 }
@@ -959,7 +823,7 @@ function MarketItem( gameState, name, x, y, cost, mouseOutImg, mouseOverImg, mou
 
 	 				// if we bought a clock, enable it!
 	 				if( that.name.indexOf("Alarm") != -1 ) gameState.alarmBought = true;
-	 				if( that.name.indexOf("Frills") != -1 ) gameState.frillsModifier = 1.05;
+	 				if( that.name.indexOf("Frills") != -1 ) gameState.frillsModifier = 5;
 
 	 				if( that.name.indexOf("Exquisite") != -1 ){ gameState.stuffingTypeModifier = gameState.stuffingTypeModifier > 1.08 ? gameState.stuffingTypeModifier : 1.08; }
 	 				if( that.name.indexOf("Special") != -1 ){ gameState.stuffingTypeModifier = gameState.stuffingTypeModifier > 1.17 ? gameState.stuffingTypeModifier : 1.17; }