Fix Nestor RR falloff effect

This reverts commit 7dbe6dbe2d.

.gitignore

@@ -11,8 +11,13 @@
 
 #Patch files
 *.patch
+
 #Personal
-/saveddata
+/saveddata/
+
+#PyCharm
+.idea/
 
 #Pyfa file
 pyfaFits.html
+build/

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -0,0 +1,48 @@
+# pyfa
+
+![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
+
+## What is it?
+
+pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux.
+
+## Latest Version and Changelogs
+The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
+
+## Installing
+Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories.
+
+## Requirements
+If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
+
+* Python >= 2.6
+* `wxPython` 2.8/3.0
+* `sqlalchemy` >= 0.6
+* `dateutil`
+* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`)
+* `requests`
+
+## Bug Reporting
+The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
+
+## License
+pyfa is licensed under the GNU GPL v3.0, see LICENSE
+
+## Resources
+* Development repository: [http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
+* XMPP conference: [pyfa@conference.jabber.org](pyfa@conference.jabber.org)
+* [EVE forum thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609)
+* [EVE University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
+* [EVE Online website](http://www.eveonline.com/)
+
+## Contacts:
+* Kadesh Priestess
+    * GitHub: @DarkFenX
+    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @kadesh
+* Sable Blitzmann
+    * GitHub: @blitzmann
+    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
+    * Email: sable.blitzmann@gmail.com
+
+## CCP Copyright Notice
+EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to Osmium to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, Osmium. CCP is in no way responsible for the content on or functioning of this website, nor can it be liable for any damage arising from the use of this website.

config.py

@@ -1,86 +1,133 @@
-import os
-import sys
-
-# Load variable overrides specific to distribution type
-try:
-    import configforced
-except ImportError:
-    configforced = None
-
-# Turns on debug mode
-debug = False
-# Defines if our saveddata will be in pyfa root or not
-saveInRoot = False
-
-# Version data
-version = "1.3.1"
-tag = "git"
-expansionName = "Crius"
-expansionVersion = "1.0"
-evemonMinVersion = "4081"
-
-pyfaPath = None
-savePath = None
-staticPath = None
-saveDB = None
-gameDB = None
-
-def defPaths():
-    global pyfaPath
-    global savePath
-    global staticPath
-    global saveDB
-    global gameDB
-    global saveInRoot
-    # The main pyfa directory which contains run.py
-    # Python 2.X uses ANSI by default, so we need to convert the character encoding
-    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
-    if pyfaPath is None:
-        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
-            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
-
-    # Where we store the saved fits etc, default is the current users home directory
-    if saveInRoot is True:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            savePath = os.path.join(pyfaPath, "saveddata")
-    else:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
-                               sys.getfilesystemencoding())
-
-    # Redirect stderr to file if we're requested to do so
-    stderrToFile = getattr(configforced, "stderrToFile", None)
-    if stderrToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stderr = open(os.path.join(savePath, "error_log.txt"), "w")
-
-    # Same for stdout
-    stdoutToFile = getattr(configforced, "stdoutToFile", None)
-    if stdoutToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
-
-    # Static EVE Data from the staticdata repository, should be in the staticdata
-    # directory in our pyfa directory
-    staticPath = os.path.join(pyfaPath, "staticdata")
-
-    # The database where we store all the fits etc
-    saveDB = os.path.join(savePath, "saveddata.db")
-
-    # The database where the static EVE data from the datadump is kept.
-    # This is not the standard sqlite datadump but a modified version created by eos
-    # maintenance script
-    gameDB = os.path.join(staticPath, "eve.db")
-
-    ## DON'T MODIFY ANYTHING BELOW ##
-    import eos.config
-
-    #Caching modifiers, disable all gamedata caching, its unneeded.
-    eos.config.gamedataCache = False
-    # saveddata db location modifier, shouldn't ever need to touch this
-    eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
-    eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
+import os
+import sys
+
+# TODO: move all logging back to pyfa.py main loop
+# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
+import logging
+import logging.handlers
+
+# Load variable overrides specific to distribution type
+try:
+    import configforced
+except ImportError:
+    configforced = None
+
+# Turns on debug mode
+debug = False
+# Defines if our saveddata will be in pyfa root or not
+saveInRoot = False
+
+# Version data
+version = "1.17.0"
+tag = "Stable"
+expansionName = "Frostline"
+expansionVersion = "1.0"
+evemonMinVersion = "4081"
+
+pyfaPath = None
+savePath = None
+saveDB = None
+gameDB = None
+
+
+class StreamToLogger(object):
+   """
+   Fake file-like stream object that redirects writes to a logger instance.
+   From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
+   """
+   def __init__(self, logger, log_level=logging.INFO):
+      self.logger = logger
+      self.log_level = log_level
+      self.linebuf = ''
+
+   def write(self, buf):
+      for line in buf.rstrip().splitlines():
+         self.logger.log(self.log_level, line.rstrip())
+
+def isFrozen():
+    if hasattr(sys, 'frozen'):
+        return True
+    else:
+        return False
+
+def getPyfaRoot():
+    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
+    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
+    root = unicode(root, sys.getfilesystemencoding())
+    return root
+
+def __createDirs(path):
+    if not os.path.exists(path):
+        os.makedirs(path)
+
+def defPaths():
+    global debug
+    global pyfaPath
+    global savePath
+    global saveDB
+    global gameDB
+    global saveInRoot
+
+    if debug:
+        logLevel = logging.DEBUG
+    else:
+        logLevel = logging.WARN
+
+    # The main pyfa directory which contains run.py
+    # Python 2.X uses ANSI by default, so we need to convert the character encoding
+    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
+    if pyfaPath is None:
+        pyfaPath = getPyfaRoot()
+
+    # Where we store the saved fits etc, default is the current users home directory
+    if saveInRoot is True:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            savePath = os.path.join(pyfaPath, "saveddata")
+    else:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+                               sys.getfilesystemencoding())
+
+    __createDirs(savePath)
+
+    if isFrozen():
+        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
+
+    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    logging.basicConfig(format=format, level=logLevel)
+    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
+    formatter = logging.Formatter(format)
+    handler.setFormatter(formatter)
+    logging.getLogger('').addHandler(handler)
+
+    logging.info("Starting pyfa")
+
+    if hasattr(sys, 'frozen'):
+        stdout_logger = logging.getLogger('STDOUT')
+        sl = StreamToLogger(stdout_logger, logging.INFO)
+        sys.stdout = sl
+
+        # This interferes with cx_Freeze's own handling of exceptions. Find a way to fix this.
+        #stderr_logger = logging.getLogger('STDERR')
+        #sl = StreamToLogger(stderr_logger, logging.ERROR)
+        #sys.stderr = sl
+
+    # The database where we store all the fits etc
+    saveDB = os.path.join(savePath, "saveddata.db")
+
+    # The database where the static EVE data from the datadump is kept.
+    # This is not the standard sqlite datadump but a modified version created by eos
+    # maintenance script
+    gameDB = os.path.join(pyfaPath, "eve.db")
+
+    ## DON'T MODIFY ANYTHING BELOW ##
+    import eos.config
+
+    #Caching modifiers, disable all gamedata caching, its unneeded.
+    eos.config.gamedataCache = False
+    # saveddata db location modifier, shouldn't ever need to touch this
+    eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
+    eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"

eos/capSim.py

@@ -59,41 +59,50 @@ class CapSimulator(object):
         return duration, capNeed
 
     def init(self, modules):
-        """prepare modules. a list of (duration, capNeed, clipSize) tuples is
+        """prepare modules. a list of (duration, capNeed, clipSize, disableStagger) tuples is
          expected, with clipSize 0 if the module has infinite ammo.
             """
-        mods = {}
-        for module in modules:
-                if module in mods:
-                        mods[module] += 1
-                else:
-                        mods[module] = 1
-
-        self.modules = mods
-
+        self.modules = modules
 
     def reset(self):
         """Reset the simulator state"""
         self.state = []
+        mods = {}
         period = 1
         disable_period = False
 
-        for (duration, capNeed, clipSize), amount in self.modules.iteritems():
+        # Loop over modules, clearing clipSize if applicable, and group modules based on attributes
+        for (duration, capNeed, clipSize, disableStagger) in self.modules:
             if self.scale:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
-            if self.stagger:
-                duration = int(duration/amount)
-            else:
-                capNeed *= amount
-
-            period = lcm(period, duration)
-
             # set clipSize to infinite if reloads are disabled unless it's
             # a cap booster module.
             if not self.reload and capNeed > 0:
                 clipSize = 0
 
+            # Group modules based on their properties
+            if (duration, capNeed, clipSize, disableStagger) in mods:
+                mods[(duration, capNeed, clipSize, disableStagger)] += 1
+            else:
+                mods[(duration, capNeed, clipSize, disableStagger)] = 1
+
+        # Loop over grouped modules, configure staggering and push to the simulation state
+        for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
+            if self.stagger and not disableStagger:
+                if clipSize == 0:
+                    duration = int(duration/amount)
+                else:
+                    stagger_amount = (duration*clipSize+10000)/(amount*clipSize)
+                    for i in range(1, amount):
+                        heapq.heappush(self.state,
+                                       [i*stagger_amount, duration,
+                                        capNeed, 0, clipSize])
+            else:
+                capNeed *= amount
+
+            period = lcm(period, duration)
+
             # period optimization doesn't work when reloads are active.
             if clipSize:
                 disable_period = True
@@ -160,13 +169,13 @@ class CapSimulator(object):
 
             iterations += 1
 
+            t_last = t_now
+
             if cap < cap_lowest:
                 if cap < 0.0:
                     break
                 cap_lowest = cap
 
-            t_last = t_now
-
             # queue the next activation of this module
             t_now += duration
             shot += 1

eos/config.py

@@ -1,11 +1,11 @@
-import os.path
+from os.path import realpath, join, dirname, abspath
 import sys
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + os.path.expanduser(os.path.join("~", ".pyfa","eve.db"))
-saveddata_connectionstring = 'sqlite:///:memory:'
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
+saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
 #Autodetect path, only change if the autodetection bugs out.
-path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/__init__.py

@@ -40,6 +40,15 @@ gamedata_meta = MetaData()
 gamedata_meta.bind = gamedata_engine
 gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False)()
 
+# This should be moved elsewhere, maybe as an actual query. Current, without try-except, it breaks when making a new
+# game db because we haven't reached gamedata_meta.create_all()
+try:
+    config.gamedata_version = gamedata_session.execute(
+            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+        ).fetchone()[0]
+except:
+    config.gamedata_version = None
+
 saveddata_connectionstring = config.saveddata_connectionstring
 if saveddata_connectionstring is not None:
     if callable(saveddata_connectionstring):
@@ -49,7 +58,6 @@ if saveddata_connectionstring is not None:
 
     saveddata_meta = MetaData()
     saveddata_meta.bind = saveddata_engine
-    migration.update(saveddata_engine)
     saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
 
 # Lock controlling any changes introduced to session
@@ -60,13 +68,8 @@ from eos.db.gamedata import *
 from eos.db.saveddata import *
 
 #Import queries
-from eos.db.gamedata.queries import getItem, searchItems, getVariations, getItemsByCategory, directAttributeRequest, \
-                                    getMarketGroup, getGroup, getCategory, getAttributeInfo, getMetaData, getMetaGroup
-from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithShip, countFitsWithShip, searchFits, \
-                                     getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
-                                     getFitList, getFleetList, getFleet, save, remove, commit, add, \
-                                     getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad, getBoosterFits, getProjectedFits
+from eos.db.gamedata.queries import *
+from eos.db.saveddata.queries import *
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
@@ -75,3 +78,4 @@ if config.saveddata_connectionstring == "sqlite:///:memory:":
 def rollback():
     with sd_lock:
         saveddata_session.rollback()
+

eos/db/gamedata/attribute.py

@@ -31,6 +31,7 @@ attributes_table = Table("dgmattribs", gamedata_meta,
                          Column("attributeID", Integer, primary_key = True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
+                         Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
                          Column("description", Unicode),
                          Column("published", Boolean),
                          Column("displayName", String),

eos/db/gamedata/item.py

@@ -30,6 +30,7 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("typeName", String, index=True),
                     Column("description", String),
                     Column("raceID", Integer),
+                    Column("factionID", Integer),
                     Column("volume", Float),
                     Column("mass", Float),
                     Column("capacity", Float),
@@ -53,9 +54,8 @@ mapper(Item, items_table,
                      "name" : synonym("typeName"),
                      "description" : deferred(items_table.c.description),
                      "traits" : relation(Traits,
-                                            primaryjoin = traits_table.c.typeID == items_table.c.typeID,
-                                            order_by = traits_table.c.typeID,
-                                            uselist = True)
+                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
+                                         uselist = False)
                     })
 
 Item.category = association_proxy("group", "category")

eos/db/gamedata/metaData.py

@@ -23,7 +23,7 @@ from eos.types import MetaData
 from eos.db import gamedata_meta
 
 metadata_table = Table("metadata", gamedata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                           Column("field_name", String, primary_key=True),
+                           Column("field_value", String))
 
 mapper(MetaData, metadata_table)

eos/db/gamedata/traits.py

@@ -1,22 +1,11 @@
 
-from sqlalchemy import Column, Table, Integer, String, ForeignKey, and_, select
-from sqlalchemy.orm import mapper, column_property
-from eos.types import Item, Traits
+from sqlalchemy import Column, Table, Integer, String, ForeignKey
+from sqlalchemy.orm import mapper
+from eos.types import Traits
 from eos.db import gamedata_meta
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
-                     Column("skillID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
-                     Column("bonusText", String, primary_key=True))
+                     Column("traitText", String))
 
-
-from .item import items_table
-
-mapper(Traits, traits_table,
-        properties = {"skillName" : column_property(
-                                             select([items_table.c.typeName],
-                                                and_(
-                                                    items_table.c.typeID == traits_table.c.skillID,
-                                                    traits_table.c.skillID != -1
-                                                )))
-        });
+mapper(Traits, traits_table);

eos/db/migration.py

@@ -1,59 +1,40 @@
-import sqlalchemy
+import config
+import shutil
+import time
+import re
+import os
+import migrations
+
+def getVersion(db):
+    cursor = db.execute('PRAGMA user_version')
+    return cursor.fetchone()[0]
+
+def getAppVersion():
+    return migrations.appVersion
 
 def update(saveddata_engine):
-    checkPriceFailures(saveddata_engine)
-    checkApiDefaultChar(saveddata_engine)
-    checkFitBooster(saveddata_engine)
+    dbVersion = getVersion(saveddata_engine)
+    appVersion = getAppVersion()
 
-def checkPriceFailures(saveddata_engine):
-    # Check if we have 'failed' column
-    try:
-        saveddata_engine.execute("SELECT failed FROM prices")
-    except sqlalchemy.exc.DatabaseError:
-        # As we don't have any important data there, let's just drop
-        # and recreate whole table
-        from eos.db.saveddata.price import prices_table
-        # Attempt to drop/create table only if it's already there
-        try:
-            prices_table.drop(saveddata_engine)
-            prices_table.create(saveddata_engine)
-        except sqlalchemy.exc.DatabaseError:
-            pass
+    if dbVersion == appVersion:
+        return
 
+    if dbVersion < appVersion:
+        # Automatically backup database
+        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+            config.savePath,
+            dbVersion,
+            appVersion,
+            time.strftime("%Y%m%d_%H%M%S"))
 
-def checkApiDefaultChar(saveddata_engine):
-    try:
-        saveddata_engine.execute("SELECT * FROM characters LIMIT 1")
-    # If table doesn't exist, it means we're doing everything from scratch
-    # and sqlalchemy will process everything as needed
-    except sqlalchemy.exc.DatabaseError:
-        pass
-    # If not, we're running on top of existing DB
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
-        # If we don't, create them
-        # This is ugly as hell, but we can't use proper migrate packages as it
-        # will require us to rebuild skeletons, including mac
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER;")
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR;")
+        shutil.copyfile(config.saveDB, toFile)
 
-def checkFitBooster(saveddata_engine):
-    try:
-        saveddata_engine.execute("SELECT * FROM fits LIMIT 1")
-    # If table doesn't exist, it means we're doing everything from scratch
-    # and sqlalchemy will process everything as needed
-    except sqlalchemy.exc.DatabaseError:
-        pass
-    # If not, we're running on top of existing DB
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
-        # If we don't, create them
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
-        # Set NULL data to 0 (needed in case of downgrade, see GH issue #62
-        saveddata_engine.execute("UPDATE fits SET booster = 0 WHERE booster IS NULL;")
+        for version in xrange(dbVersion, appVersion):
+
+            func = migrations.updates[version+1]
+            if func:
+                print "applying update",version+1
+                func(saveddata_engine)
+
+        # when all is said and done, set version to current
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/db/migrations/__init__.py

@@ -0,0 +1,31 @@
+"""
+The migration module includes migration logic to update database scheme and/or
+data for the user database.
+
+To create a migration, simply create a file upgrade<migration number>.py and
+define an upgrade() function with the logic. Please note that there must be as
+many upgrade files as there are database versions (version 5 would include
+upgrade files 1-5)
+"""
+
+import pkgutil
+import re
+
+
+updates = {}
+appVersion = 0
+
+prefix = __name__ + "."
+for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
+    # loop through python files, extracting update number and function, and
+    # adding it to a list
+    modname_tail = modname.rsplit('.', 1)[-1]
+    module = __import__(modname, fromlist=True)
+    m = re.match("^upgrade(?P<index>\d+)$", modname_tail)
+    if not m:
+        continue
+    index = int(m.group("index"))
+    appVersion = max(appVersion, index)
+    upgrade = getattr(module, "upgrade", False)
+    if upgrade:
+        updates[index] = upgrade

eos/db/migrations/upgrade1.py

@@ -0,0 +1,97 @@
+"""
+Migration 1
+
+- Alters fits table to introduce target resist attribute
+- Converts modules based on Oceanus Module Tiericide
+    Some modules have been deleted, which causes pyfa to crash when fits are
+    loaded as they no longer exist in the database. We therefore replace these
+    modules with their new replacements
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-oceanus/
+    and output of itemDiff.py
+"""
+
+import sqlalchemy
+
+CONVERSIONS = {
+    6135: [  # Scoped Cargo Scanner
+        6133,  # Interior Type-E Cargo Identifier
+    ],
+    6527: [  # Compact Ship Scanner
+        6525,  # Ta3 Perfunctory Vessel Probe
+        6529,  # Speculative Ship Identifier I
+        6531,  # Practical Type-E Ship Probe
+    ],
+    6569: [  # Scoped Survey Scanner
+        6567,  # ML-3 Amphilotite Mining Probe
+        6571,  # Rock-Scanning Sensor Array I
+        6573,  # 'Dactyl' Type-E Asteroid Analyzer
+    ],
+    509: [  # 'Basic' Capacitor Flux Coil
+        8163,  # Partial Power Plant Manager: Capacitor Flux
+        8165,  # Alpha Reactor Control: Capacitor Flux
+        8167,  # Type-E Power Core Modification: Capacitor Flux
+        8169,  # Marked Generator Refitting: Capacitor Flux
+    ],
+    8135: [  # Restrained Capacitor Flux Coil
+        8131,  # Local Power Plant Manager: Capacitor Flux I
+    ],
+    8133: [  # Compact Capacitor Flux Coil
+        8137,  # Mark I Generator Refitting: Capacitor Flux
+    ],
+    3469: [  # Basic Co-Processor
+        8744,  # Nanoelectrical Co-Processor
+        8743,  # Nanomechanical CPU Enhancer
+        8746,  # Quantum Co-Processor
+        8745,  # Photonic CPU Enhancer
+        15425,  # Naiyon's Modified Co-Processor (never existed but convert
+                # anyway as some fits may include it)
+    ],
+    8748: [  # Upgraded Co-Processor
+        8747,  # Nanomechanical CPU Enhancer I
+        8750,  # Quantum Co-Processor I
+        8749,  # Photonic CPU Enhancer I
+    ],
+    1351: [  # Basic Reactor Control Unit
+        8251,  # Partial Power Plant Manager: Reaction Control
+        8253,  # Alpha Reactor Control: Reaction Control
+        8257,  # Marked Generator Refitting: Reaction Control
+    ],
+    8263: [  # Compact Reactor Control Unit
+        8259,  # Local Power Plant Manager: Reaction Control I
+        8265,  # Mark I Generator Refitting: Reaction Control
+        8261,  # Beta Reactor Control: Reaction Control I
+    ],
+    16537: [  # Compact Micro Auxiliary Power Core
+        16539,  # Micro B88 Core Augmentation
+        16541,  # Micro K-Exhaust Core Augmentation
+    ],
+    31936: [  # Navy Micro Auxiliary Power Core
+        16543,  # Micro 'Vigor' Core Augmentation
+    ],
+    8089: [  # Compact Light Missile Launcher
+       8093,  # Prototype 'Arbalest' Light Missile Launcher
+    ],
+    8091: [  # Ample Light Missile Launcher
+        7993,  # Experimental TE-2100 Light Missile Launcher
+    ],
+    # Surface Cargo Scanner I was removed from game, however no mention of
+    # replacement module in patch notes. Morphing it to meta 0 module to be safe
+    442: [  # Cargo Scanner I
+        6129,  # Surface Cargo Scanner I
+    ]
+}
+
+def upgrade(saveddata_engine):
+    # Update fits schema to include target resists attribute
+    try:
+        saveddata_engine.execute("SELECT targetResistsID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN targetResistsID INTEGER;")
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade10.py

@@ -0,0 +1,16 @@
+"""
+Migration 10
+
+- Adds active attribute to projected fits
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    # Update projectedFits schema to include active attribute
+    try:
+        saveddata_engine.execute("SELECT active FROM projectedFits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE projectedFits ADD COLUMN active BOOLEAN")
+        saveddata_engine.execute("UPDATE projectedFits SET active = 1")
+        saveddata_engine.execute("UPDATE projectedFits SET amount = 1")

eos/db/migrations/upgrade11.py

@@ -0,0 +1,116 @@
+"""
+Migration 11
+
+- Converts modules based on December Release 2015 Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+
+CONVERSIONS = {
+    16467: (  # Medium Gremlin Compact Energy Neutralizer
+        16471,  # Medium Unstable Power Fluctuator I
+    ),
+    22947: (  # 'Beatnik' Small Remote Armor Repairer
+        23414,  # 'Brotherhood' Small Remote Armor Repairer
+    ),
+    8295: (  # Type-D Restrained Shield Flux Coil
+        8293,  # Beta Reactor Control: Shield Flux I
+    ),
+    16499: (  # Heavy Knave Scoped Energy Nosferatu
+        16501,  # E500 Prototype Energy Vampire
+    ),
+    16477: (  # Heavy Infectious Scoped Energy Neutralizer
+        16473,  # Heavy Rudimentary Energy Destabilizer I
+    ),
+    16475: (  # Heavy Gremlin Compact Energy Neutralizer
+        16479,  # Heavy Unstable Power Fluctuator I
+    ),
+    16447: (  # Medium Solace Scoped Remote Armor Repairer
+        16445,  # Medium 'Arup' Remote Armor Repairer
+    ),
+    508: (  # 'Basic' Shield Flux Coil
+        8325,  # Alpha Reactor Shield Flux
+        8329,  # Marked Generator Refitting: Shield Flux
+        8323,  # Partial Power Plant Manager: Shield Flux
+        8327,  # Type-E Power Core Modification: Shield Flux
+    ),
+    1419: (  # 'Basic' Shield Power Relay
+        8341,  # Alpha Reactor Shield Power Relay
+        8345,  # Marked Generator Refitting: Shield Power Relay
+        8339,  # Partial Power Plant Manager: Shield Power Relay
+        8343,  # Type-E Power Core Modification: Shield Power Relay
+    ),
+    16439: (  # Small Solace Scoped Remote Armor Repairer
+        16437,  # Small 'Arup' Remote Armor Repairer
+    ),
+    16505: (  # Medium Ghoul Compact Energy Nosferatu
+        16511,  # Medium Diminishing Power System Drain I
+    ),
+    8297: (  # Mark I Compact Shield Flux Coil
+        8291,  # Local Power Plant Manager: Reaction Shield Flux I
+    ),
+    16455: (  # Large Solace Scoped Remote Armor Repairer
+        16453,  # Large 'Arup' Remote Armor Repairer
+    ),
+    6485: (  # M51 Benefactor Compact Shield Recharger
+        6491,  # Passive Barrier Compensator I
+        6489,  # 'Benefactor' Ward Reconstructor
+        6487,  # Supplemental Screen Generator I
+    ),
+    5137: (  # Small Knave Scoped Energy Nosferatu
+        5135,  # E5 Prototype Energy Vampire
+    ),
+    8579: (  # Medium Murky Compact Remote Shield Booster
+        8581,  # Medium 'Atonement' Remote Shield Booster
+    ),
+    8531: (  # Small Murky Compact Remote Shield Booster
+        8533,  # Small 'Atonement' Remote Shield Booster
+    ),
+    16497: (  # Heavy Ghoul Compact Energy Nosferatu
+        16503,  # Heavy Diminishing Power System Drain I
+    ),
+    4477: (  # Small Gremlin Compact Energy Neutralizer
+        4475,  # Small Unstable Power Fluctuator I
+    ),
+    8337: (  # Mark I Compact Shield Power Relay
+        8331,  # Local Power Plant Manager: Reaction Shield Power Relay I
+    ),
+    23416: (  # 'Peace' Large Remote Armor Repairer
+        22951,  # 'Pacifier' Large Remote Armor Repairer
+    ),
+    5141: (  # Small Ghoul Compact Energy Nosferatu
+        5139,  # Small Diminishing Power System Drain I
+    ),
+    4471: (  # Small Infectious Scoped Energy Neutralizer
+        4473,  # Small Rudimentary Energy Destabilizer I
+    ),
+    16469: (  # Medium Infectious Scoped Energy Neutralizer
+        16465,  # Medium Rudimentary Energy Destabilizer I
+    ),
+    8335: (  # Type-D Restrained Shield Power Relay
+        8333,  # Beta Reactor Control: Shield Power Relay I
+    ),
+    405: (  # 'Micro' Remote Shield Booster
+        8631,  # Micro Asymmetric Remote Shield Booster
+        8627,  # Micro Murky Remote Shield Booster
+        8629,  # Micro 'Atonement' Remote Shield Booster
+        8633,  # Micro S95a Remote Shield Booster
+    ),
+    8635: (  # Large Murky Compact Remote Shield Booster
+        8637,  # Large 'Atonement' Remote Shield Booster
+    ),
+    16507: (  # Medium Knave Scoped Energy Nosferatu
+        16509,  # E50 Prototype Energy Vampire
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade2.py

@@ -0,0 +1,21 @@
+"""
+Migration 2
+
+- Includes old upgrade paths pre-1.5.0. See GH issue #190 for why this is needed
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    # Update characters schema to include default chars
+    try:
+        saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER")
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR")
+
+    # Update fits schema to include booster attribute
+    try:
+        saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN")

eos/db/migrations/upgrade3.py

@@ -0,0 +1,13 @@
+"""
+Migration 3
+
+- Adds mode column for fits (t3 dessy)
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT modeID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN modeID INTEGER")

eos/db/migrations/upgrade4.py

@@ -0,0 +1,141 @@
+"""
+Migration 4
+
+- Converts modules based on Proteus Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-proteus/
+    and output of itemDiff.py
+"""
+
+
+CONVERSIONS = {
+    506: (  # 'Basic' Capacitor Power Relay
+        8205,  # Alpha Reactor Control: Capacitor Power Relay
+        8209,  # Marked Generator Refitting: Capacitor Power Relay
+        8203,  # Partial Power Plant Manager: Capacity Power Relay
+        8207,  # Type-E Power Core Modification: Capacitor Power Relay
+    ),
+    8177: (  # Mark I Compact Capacitor Power Relay
+        8173,  # Beta Reactor Control: Capacitor Power Relay I
+    ),
+    8175: (  # Type-D Restrained Capacitor Power Relay
+        8171,  # Local Power Plant Manager: Capacity Power Relay I
+    ),
+
+    421: (  # 'Basic' Capacitor Recharger
+        4425,  # AGM Capacitor Charge Array,
+        4421,  # F-a10 Buffer Capacitor Regenerator
+        4423,  # Industrial Capacitor Recharger
+        4427,  # Secondary Parallel Link-Capacitor
+    ),
+    4435: (  # Eutectic Compact Cap Recharger
+        4433,  # Barton Reactor Capacitor Recharger I
+        4431,  # F-b10 Nominal Capacitor Regenerator
+        4437,  # Fixed Parallel Link-Capacitor I
+    ),
+
+    1315: (  # 'Basic' Expanded Cargohold
+        5483,  # Alpha Hull Mod Expanded Cargo
+        5479,  # Marked Modified SS Expanded Cargo
+        5481,  # Partial Hull Conversion Expanded Cargo
+        5485,  # Type-E Altered SS Expanded Cargo
+    ),
+    5493: (  # Type-D Restrained Expanded Cargo
+        5491,  # Beta Hull Mod Expanded Cargo
+        5489,  # Local Hull Conversion Expanded Cargo I
+        5487,  # Mark I Modified SS Expanded Cargo
+    ),
+
+    1401: (  # 'Basic' Inertial Stabilizers
+        5523,  # Alpha Hull Mod Inertial Stabilizers
+        5521,  # Partial Hull Conversion Inertial Stabilizers
+        5525,  # Type-E Altered SS Inertial Stabilizers
+    ),
+    5533: (  # Type-D Restrained Inertial Stabilizers
+        5531,  # Beta Hull Mod Inertial Stabilizers
+        5529,  # Local Hull Conversion Inertial Stabilizers I
+        5527,  # Mark I Modified SS Inertial Stabilizers
+        5519,  # Marked Modified SS Inertial Stabilizers
+    ),
+
+    5239: (  # EP-S Gaussian Scoped Mining Laser
+        5241,  # Dual Diode Mining Laser I
+    ),
+    5233: (  # Single Diode Basic Mining Laser
+        5231,  # EP-R Argon Ion Basic Excavation Pulse
+        5237,  # Rubin Basic Particle Bore Stream
+        5235,  # Xenon Basic Drilling Beam
+    ),
+    5245: (  # Particle Bore Compact Mining Laser
+        5243,  # XeCl Drilling Beam I
+    ),
+
+    22619: (  # Frigoris Restrained Ice Harvester Upgrade
+        22617,  # Crisium Ice Harvester Upgrade
+    ),
+    22611: (  # Elara Restrained Mining Laser Upgrade
+        22609,  # Erin Mining Laser Upgrade
+    ),
+
+    1242: (  # 'Basic' Nanofiber Internal Structure
+        5591,  # Alpha Hull Mod Nanofiber Structure
+        5595,  # Marked Modified SS Nanofiber Structure
+        5559,  # Partial Hull Conversion Nanofiber Structure
+        5593,  # Type-E Altered SS Nanofiber Structure
+    ),
+    5599: (  # Type-D Restrained Nanofiber Structure
+        5597,  # Beta Hull Mod Nanofiber Structure
+        5561,  # Local Hull Conversion Nanofiber Structure I
+        5601,  # Mark I Modified SS Nanofiber Structure
+    ),
+
+    1192: (  # 'Basic' Overdrive Injector System
+        5613,  # Alpha Hull Mod Overdrive Injector
+        5617,  # Marked Modified SS Overdrive Injector
+        5611,  # Partial Hull Conversion Overdrive Injector
+        5615,  # Type-E Altered SS Overdrive Injector
+    ),
+    5631: (  # Type-D Restrained Overdrive Injector
+        5629,  # Beta Hull Mod Overdrive Injector
+        5627,  # Local Hull Conversion Overdrive Injector I
+        5633,  # Mark I Modified SS Overdrive Injector
+    ),
+
+    1537: (  # 'Basic' Power Diagnostic System
+        8213,  # Alpha Reactor Control: Diagnostic System
+        8217,  # Marked Generator Refitting: Diagnostic System
+        8211,  # Partial Power Plant Manager: Diagnostic System
+        8215,  # Type-E Power Core Modification: Diagnostic System
+        8255,  # Type-E Power Core Modification: Reaction Control
+    ),
+    8225: (  # Mark I Compact Power Diagnostic System
+        8221,  # Beta Reactor Control: Diagnostic System I
+        8219,  # Local Power Plant Manager: Diagnostic System I
+        8223,  # Type-D Power Core Modification: Diagnostic System
+    ),
+
+    1240: (  # 'Basic' Reinforced Bulkheads
+        5677,  # Alpha Hull Mod Reinforced Bulkheads
+        5681,  # Marked Modified SS Reinforced Bulkheads
+        5675,  # Partial Hull Conversion Reinforced Bulkheads
+        5679,  # Type-E Altered SS Reinforced Bulkheads
+    ),
+    5649: (  # Mark I Compact Reinforced Bulkheads
+        5645,  # Beta Hull Mod Reinforced Bulkheads
+    ),
+    5647: (  # Type-D Restrained Reinforced Bulkheads
+        5643,  # Local Hull Conversion Reinforced Bulkheads I
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade5.py

@@ -0,0 +1,8 @@
+"""
+Migration 5
+
+Simply deletes damage profiles with a blank name. See GH issue #256
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ?', ("",))

eos/db/migrations/upgrade6.py

@@ -0,0 +1,9 @@
+"""
+Migration 6
+
+Overwrites damage profile 0 to reset bad uniform values (bad values set with bug)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)', (1, "Uniform", 25, 25, 25, 25, None))

eos/db/migrations/upgrade7.py

@@ -0,0 +1,24 @@
+"""
+Migration 7
+
+- Converts Scorpion Ishukone Watch to Scorpion
+
+    Mosaic introduced proper skinning system, and Ishukone Scorp
+    was the only ship which was presented as stand-alone ship in
+    Pyfa.
+"""
+
+
+CONVERSIONS = {
+    640: (  # Scorpion
+        4005,  # Scorpion Ishukone Watch
+    )
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert ships
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade8.py

@@ -0,0 +1,85 @@
+"""
+Migration 8
+
+- Converts modules based on Carnyx Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+
+CONVERSIONS = {
+    8529: (  # Large F-S9 Regolith Compact Shield Extender
+        8409,  # Large Subordinate Screen Stabilizer I
+    ),
+    8419: (  # Large Azeotropic Restrained Shield Extender
+        8489,  # Large Supplemental Barrier Emitter I
+    ),
+    8517: (  # Medium F-S9 Regolith Compact Shield Extender
+        8397,  # Medium Subordinate Screen Stabilizer I
+    ),
+    8433: (  # Medium Azeotropic Restrained Shield Extender
+        8477,  # Medium Supplemental Barrier Emitter I
+    ),
+    20627: (  # Small 'Trapper' Shield Extender
+        8437,  # Micro Azeotropic Ward Salubrity I
+        8505,  # Micro F-S9 Regolith Shield Induction
+        3849,  # Micro Shield Extender I
+        3851,  # Micro Shield Extender II
+        8387,  # Micro Subordinate Screen Stabilizer I
+        8465,  # Micro Supplemental Barrier Emitter I
+    ),
+    8521: (  # Small F-S9 Regolith Compact Shield Extender
+        8401,  # Small Subordinate Screen Stabilizer I
+    ),
+    8427: (  # Small Azeotropic Restrained Shield Extender
+        8481,  # Small Supplemental Barrier Emitter I
+    ),
+    11343: (  # 100mm Crystalline Carbonide Restrained Plates
+        11345,  # 100mm Reinforced Nanofiber Plates I
+    ),
+    11341: (  # 100mm Rolled Tungsten Compact Plates
+        11339,  # 100mm Reinforced Titanium Plates I
+    ),
+    11327: (  # 1600mm Crystalline Carbonide Restrained Plates
+        11329,  # 1600mm Reinforced Nanofiber Plates I
+    ),
+    11325: (  # 1600mm Rolled Tungsten Compact Plates
+        11323,  # 1600mm Reinforced Titanium Plates I
+    ),
+    11351: (  # 200mm Crystalline Carbonide Restrained Plates
+        11353,  # 200mm Reinforced Nanofiber Plates I
+    ),
+    11349: (  # 200mm Rolled Tungsten Compact Plates
+        11347,  # 200mm Reinforced Titanium Plates I
+    ),
+    11311: (  # 400mm Crystalline Carbonide Restrained Plates
+        11313,  # 400mm Reinforced Nanofiber Plates I
+    ),
+    11309: (  # 400mm Rolled Tungsten Compact Plates
+        11307,  # 400mm Reinforced Titanium Plates I
+    ),
+    23791: (  # 'Citadella' 100mm Steel Plates
+        11335,  # 50mm Reinforced Crystalline Carbonide Plates I
+        11337,  # 50mm Reinforced Nanofiber Plates I
+        11333,  # 50mm Reinforced Rolled Tungsten Plates I
+        11291,  # 50mm Reinforced Steel Plates I
+        20343,  # 50mm Reinforced Steel Plates II
+        11331,  # 50mm Reinforced Titanium Plates I
+    ),
+    11319: (  # 800mm Crystalline Carbonide Restrained Plates
+        11321,  # 800mm Reinforced Nanofiber Plates I
+    ),
+    11317: (  # 800mm Rolled Tungsten Compact Plates
+        11315,  #  800mm Reinforced Titanium Plates I
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade9.py

@@ -0,0 +1,23 @@
+"""
+Migration 9
+
+Effectively drops UNIQUE constraint from boosters table. SQLite does not support
+this, so we have to copy the table to the updated schema and then rename it
+"""
+
+tmpTable = """
+CREATE TABLE boostersTemp (
+    'ID' INTEGER NOT NULL,
+    'itemID' INTEGER,
+    'fitID' INTEGER NOT NULL,
+    'active' BOOLEAN,
+    PRIMARY KEY(ID),
+    FOREIGN KEY('fitID') REFERENCES fits ('ID')
+)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute(tmpTable)
+    saveddata_engine.execute("INSERT INTO boostersTemp (ID, itemID, fitID, active) SELECT ID, itemID, fitID, active FROM boosters")
+    saveddata_engine.execute("DROP TABLE boosters")
+    saveddata_engine.execute("ALTER TABLE boostersTemp RENAME TO boosters")

eos/db/saveddata/__init__.py

@@ -1,3 +1,18 @@
-__all__ = ["character", "fit", "module", "user", "skill", "price",
-           "booster", "drone", "implant", "fleet", "damagePattern",
-           "miscData"]
+__all__ = [
+    "character",
+    "fit",
+    "module",
+    "user",
+    "skill",
+    "price",
+    "booster",
+    "drone",
+    "implant",
+    "fleet",
+    "damagePattern",
+    "miscData",
+    "targetResists",
+    "override",
+    "crest"
+]
+

eos/db/saveddata/booster.py

@@ -29,7 +29,7 @@ boosters_table = Table("boosters", saveddata_meta,
                        Column("itemID", Integer),
                        Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False),
                        Column("active", Boolean),
-                       UniqueConstraint("itemID", "fitID"))
+                       )
 
 activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
                                 Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),

eos/db/saveddata/crest.py

@@ -0,0 +1,31 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, String, Boolean
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import CrestChar
+
+crest_table = Table("crest", saveddata_meta,
+                         Column("ID", Integer, primary_key = True),
+                         Column("name", String, nullable = False, unique = True),
+                         Column("refresh_token", String, nullable = False))
+
+mapper(CrestChar, crest_table)

eos/db/saveddata/fit.py

@@ -17,19 +17,20 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String, Boolean
-from sqlalchemy.orm import relation, mapper
+from sqlalchemy import *
+from sqlalchemy.orm import *
 from sqlalchemy.sql import and_
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.module import modules_table
 from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern
-from eos.effectHandlerHelpers import HandledModuleList, HandledDroneList, \
-HandledImplantBoosterList, HandledProjectedModList, HandledProjectedDroneList, \
-HandledProjectedFitList, HandledCargoList
+from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
+from eos.effectHandlerHelpers import *
+
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
                          Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
@@ -38,35 +39,127 @@ fits_table = Table("fits", saveddata_meta,
                          Column("timestamp", Integer, nullable = False),
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
                          Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0))
+                         Column("booster", Boolean, nullable = False, index = True, default = 0),
+                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
+                         Column("modeID", Integer, nullable=True),
+)
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
                             Column("victimID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("amount", Integer))
+                            Column("amount", Integer, nullable = False, default = 1),
+                            Column("active", Boolean, nullable = False, default = 1),
+)
+
+class ProjectedFit(object):
+    def __init__(self, sourceID, source_fit, amount=1, active=True):
+        self.sourceID = sourceID
+        self.source_fit = source_fit
+        self.active = active
+        self.__amount = amount
+
+    @reconstructor
+    def init(self):
+        if self.source_fit.isInvalid:
+            # Very rare for this to happen, but be prepared for it
+            eos.db.saveddata_session.delete(self.source_fit)
+            eos.db.saveddata_session.flush()
+            eos.db.saveddata_session.refresh(self.victim_fit)
+
+    # We have a series of setters and getters here just in case someone
+    # downgrades and screws up the table with NULL values
+    @property
+    def amount(self):
+        return self.__amount or 1
+
+    @amount.setter
+    def amount(self, amount):
+        self.__amount = amount
+
+    def __repr__(self):
+        return "ProjectedFit(sourceID={}, victimID={}, amount={}, active={}) at {}".format(
+            self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
+        )
+
+Fit._Fit__projectedFits = association_proxy(
+    "victimOf",  # look at the victimOf association...
+    "source_fit",  # .. and return the source fits
+    creator=lambda sourceID, source_fit: ProjectedFit(sourceID, source_fit)
+)
+
 mapper(Fit, fits_table,
-       properties = {"_Fit__modules" : relation(Module, collection_class = HandledModuleList,
-                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
-                                                order_by = modules_table.c.position, cascade='all, delete, delete-orphan'),
-                     "_Fit__projectedModules" : relation(Module, collection_class = HandledProjectedModList, cascade='all, delete, delete-orphan', single_parent=True,
-                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
-                     "owner" : relation(User, backref = "fits"),
-                     "_Fit__boosters" : relation(Booster, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True),
-                     "_Fit__drones" : relation(Drone, collection_class = HandledDroneList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
-                     "_Fit__cargo" : relation(Cargo, collection_class = HandledCargoList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(cargo_table.c.fitID == fits_table.c.ID)),
-                     "_Fit__projectedDrones" : relation(Drone, collection_class = HandledProjectedDroneList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
-                     "_Fit__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True,
-                                                 primaryjoin = fitImplants_table.c.fitID == fits_table.c.ID,
-                                                 secondaryjoin = fitImplants_table.c.implantID == Implant.ID,
-                                                 secondary = fitImplants_table),
-                     "_Fit__character" : relation(Character, backref = "fits"),
-                     "_Fit__damagePattern" : relation(DamagePattern),
-                     "_Fit__projectedFits" : relation(Fit,
-                                                      primaryjoin = projectedFits_table.c.victimID == fits_table.c.ID,
-                                                      secondaryjoin = fits_table.c.ID == projectedFits_table.c.sourceID,
-                                                      secondary = projectedFits_table,
-                                                      collection_class = HandledProjectedFitList)
-                     })
+        properties = {
+            "_Fit__modules": relation(
+                Module,
+                collection_class=HandledModuleList,
+                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
+                order_by=modules_table.c.position,
+                cascade='all, delete, delete-orphan'),
+            "_Fit__projectedModules": relation(
+                Module,
+                collection_class=HandledProjectedModList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
+            "owner": relation(
+                User,
+                backref="fits"),
+            "itemID": fits_table.c.shipID,
+            "shipID": fits_table.c.shipID,
+            "_Fit__boosters": relation(
+                Booster,
+                collection_class=HandledImplantBoosterList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True),
+            "_Fit__drones": relation(
+                Drone,
+                collection_class=HandledDroneCargoList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+            "_Fit__cargo": relation(
+                Cargo,
+                collection_class=HandledDroneCargoList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
+            "_Fit__projectedDrones": relation(
+                Drone,
+                collection_class=HandledProjectedDroneList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+            "_Fit__implants": relation(
+                Implant,
+                collection_class=HandledImplantBoosterList,
+                cascade='all, delete, delete-orphan',
+                backref='fit',
+                single_parent=True,
+                primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
+                secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
+                secondary=fitImplants_table),
+            "_Fit__character": relation(
+                Character,
+                backref="fits"),
+            "_Fit__damagePattern": relation(DamagePattern),
+            "_Fit__targetResists": relation(TargetResists),
+            "projectedOnto": relationship(
+                ProjectedFit,
+                primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+                backref='source_fit',
+                collection_class=attribute_mapped_collection('victimID'),
+                cascade='all, delete, delete-orphan'),
+            "victimOf": relationship(
+                ProjectedFit,
+                primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
+                backref='victim_fit',
+                collection_class=attribute_mapped_collection('sourceID'),
+                cascade='all, delete, delete-orphan'),
+       }
+)
+
+mapper(ProjectedFit, projectedFits_table,
+       properties = {
+            "_ProjectedFit__amount": projectedFits_table.c.amount,
+       }
+)

eos/db/saveddata/override.py

@@ -0,0 +1,31 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, Float
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import Override
+
+overrides_table = Table("overrides", saveddata_meta,
+                     Column("itemID", Integer, primary_key=True,  index = True),
+                     Column("attrID", Integer, primary_key=True, index = True),
+                     Column("value", Float, nullable = False))
+
+mapper(Override, overrides_table)

eos/db/saveddata/queries.py

@@ -19,7 +19,8 @@
 
 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad
+
+from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists, Override, CrestChar
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -182,9 +183,15 @@ def getFit(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == fitID).first()
+                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == lookfor).first()
     else:
         raise TypeError("Need integer as argument")
+
+    if fit and fit.isInvalid:
+        with sd_lock:
+            removeInvalid([fit])
+        return None
+
     return fit
 
 @cachedQuery(Fleet, 1, "fleetID")
@@ -244,9 +251,10 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         filter = processWhere(filter, where)
         eager = processEager(eager)
         with sd_lock:
-            fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+            fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
     else:
         raise TypeError("ShipID must be integer")
+
     return fits
 
 def getBoosterFits(ownerID=None, where=None, eager=None):
@@ -264,9 +272,15 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
     filter = processWhere(filter, where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
+def countAllFits():
+    with sd_lock:
+        count = saveddata_session.query(Fit).count()
+    return count
+
 def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -290,7 +304,8 @@ def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).all())
+
     return fits
 
 def getFleetList(eager=None):
@@ -308,6 +323,12 @@ def getPrice(typeID):
         raise TypeError("Need integer as argument")
     return price
 
+def clearPrices():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(Price).delete()
+    commit()
+    return deleted_rows
+
 def getMiscData(field):
     if isinstance(field, basestring):
         with sd_lock:
@@ -322,6 +343,12 @@ def getDamagePatternList(eager=None):
         patterns = saveddata_session.query(DamagePattern).options(*eager).all()
     return patterns
 
+def getTargetResistsList(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        patterns = saveddata_session.query(TargetResists).options(*eager).all()
+    return patterns
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -340,6 +367,24 @@ def getDamagePattern(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return pattern
 
+@cachedQuery(TargetResists, 1, "lookfor")
+def getTargetResists(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.name == lookfor).first()
+    else:
+        raise TypeError("Need integer or string as argument")
+    return pattern
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
@@ -350,7 +395,8 @@ def searchFits(nameLike, where=None, eager=None):
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
 def getSquadsIDsWithFitID(fitID):
@@ -361,7 +407,7 @@ def getSquadsIDsWithFitID(fitID):
             return squads
     else:
         raise TypeError("Need integer as argument")
-        
+
 def getProjectedFits(fitID):
     if isinstance(fitID, int):
         with sd_lock:
@@ -369,7 +415,56 @@ def getProjectedFits(fitID):
             fits = saveddata_session.query(Fit).filter(filter).all()
             return fits
     else:
-        raise TypeError("Need integer as argument")        
+        raise TypeError("Need integer as argument")
+
+def getCrestCharacters(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        characters = saveddata_session.query(CrestChar).options(*eager).all()
+    return characters
+
+@cachedQuery(CrestChar, 1, "lookfor")
+def getCrestCharacter(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                character = saveddata_session.query(CrestChar).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
+    else:
+        raise TypeError("Need integer or string as argument")
+    return character
+
+def getOverrides(itemID, eager=None):
+    if isinstance(itemID, int):
+        return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
+    else:
+        raise TypeError("Need integer as argument")
+
+def clearOverrides():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(Override).delete()
+    commit()
+    return deleted_rows
+
+def getAllOverrides(eager=None):
+    return saveddata_session.query(Override).all()
+
+def removeInvalid(fits):
+    invalids = [f for f in fits if f.isInvalid]
+
+    if invalids:
+        map(fits.remove, invalids)
+        map(saveddata_session.delete, invalids)
+        saveddata_session.commit()
+
+    return fits
 
 def add(stuff):
     with sd_lock:

eos/db/saveddata/targetResists.py

@@ -0,0 +1,35 @@
+#===============================================================================
+# Copyright (C) 2014 Ryan Holmes
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import TargetResists
+
+targetResists_table = Table("targetResists", saveddata_meta,
+                             Column("ID", Integer, primary_key = True),
+                             Column("name", String),
+                             Column("emAmount", Float),
+                             Column("thermalAmount", Float),
+                             Column("kineticAmount", Float),
+                             Column("explosiveAmount", Float),
+                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+
+mapper(TargetResists, targetResists_table)

eos/effectHandlerHelpers.py

@@ -17,8 +17,12 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
+#from sqlalchemy.orm.attributes import flag_modified
 import eos.db
 import eos.types
+import logging
+
+logger = logging.getLogger(__name__)
 
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):
@@ -101,6 +105,14 @@ class HandledList(list):
             except AttributeError:
                 pass
 
+    def remove(self, thing):
+        # We must flag it as modified, otherwise it not be removed from the database
+        # @todo: flag_modified isn't in os x skel. need to rebuild to include
+        #flag_modified(thing, "itemID")
+        if thing.isInvalid:  # see GH issue #324
+            thing.itemID = 0
+        list.remove(self, thing)
+
 class HandledModuleList(HandledList):
     def append(self, mod):
         emptyPosition = float("Inf")
@@ -115,10 +127,14 @@ class HandledModuleList(HandledList):
             del self[emptyPosition]
             mod.position = emptyPosition
             HandledList.insert(self, emptyPosition, mod)
+            if mod.isInvalid:
+                self.remove(mod)
             return
 
         mod.position = len(self)
         HandledList.append(self, mod)
+        if mod.isInvalid:
+            self.remove(mod)
 
     def insert(self, index, mod):
         mod.position = index
@@ -143,139 +159,82 @@ class HandledModuleList(HandledList):
             dummy.position = index
             self[index] = dummy
 
+    def toModule(self, index, mod):
+        mod.position = index
+        self[index] = mod
+
     def freeSlot(self, slot):
         for i in range(len(self) -1, -1, -1):
             mod = self[i]
             if mod.getModifiedItemAttr("subSystemSlot") == slot:
                 del self[i]
 
-class HandledDroneList(HandledList):
+class HandledDroneCargoList(HandledList):
     def find(self, item):
-        for d in self:
-            if d.item == item:
-                yield d
+        for o in self:
+            if o.item == item:
+                yield o
 
     def findFirst(self, item):
-        for d in self.find(item):
-            return d
+        for o in self.find(item):
+            return o
 
-    def append(self, drone):
-        list.append(self, drone)
+    def append(self, thing):
+        HandledList.append(self, thing)
 
-    def remove(self, drone):
-        HandledList.remove(self, drone)
-
-    def appendItem(self, item, amount = 1):
-        if amount < 1: ValueError("Amount of drones to add should be >= 1")
-        d = self.findFirst(item)
-
-        if d is None:
-            d = eos.types.Drone(item)
-            self.append(d)
-
-        d.amount += amount
-        return d
-
-    def removeItem(self, item, amount):
-        if amount < 1: ValueError("Amount of drones to remove should be >= 1")
-        d = self.findFirst(item)
-        if d is None: return
-        d.amount -= amount
-        if d.amount <= 0:
-            self.remove(d)
-            return None
-
-        return d
-
-class HandledCargoList(HandledList):
-    # shameless copy of HandledDroneList
-    # I have no idea what this does, but I needed it
-    # @todo: investigate this
-    def find(self, item):
-        for d in self:
-            if d.item == item:
-                yield d
-
-    def findFirst(self, item):
-        for d in self.find(item):
-            return d
-
-    def append(self, cargo):
-        list.append(self, cargo)
-
-    def remove(self, cargo):
-        HandledList.remove(self, cargo)
-
-    def appendItem(self, item, qty = 1):
-        if qty < 1: ValueError("Amount of cargo to add should be >= 1")
-        d = self.findFirst(item)
-
-        if d is None:
-            d = eos.types.Cargo(item)
-            self.append(d)
-
-        d.qty += qty
-        return d
-
-    def removeItem(self, item, qty):
-        if qty < 1: ValueError("Amount of cargo to remove should be >= 1")
-        d = self.findFirst(item)
-        if d is None: return
-        d.qty -= qty
-        if d.qty <= 0:
-            self.remove(d)
-            return None
-
-        return d
+        if thing.isInvalid:
+            self.remove(thing)
 
 class HandledImplantBoosterList(HandledList):
-    def __init__(self):
-        self.__slotCache = {}
+    def append(self, thing):
+        if thing.isInvalid:
+            HandledList.append(self, thing)
+            self.remove(thing)
+            return
 
-    def append(self, implant):
-        if self.__slotCache.has_key(implant.slot):
-            raise ValueError("Implant/Booster slot already in use, remove the old one first or set replace = True")
-        self.__slotCache[implant.slot] = implant
-        HandledList.append(self, implant)
+        # if needed, remove booster that was occupying slot
+        oldObj = next((m for m in self if m.slot == thing.slot), None)
+        if oldObj:
+            logging.info("Slot %d occupied with %s, replacing with %s", thing.slot, oldObj.item.name, thing.item.name)
+            oldObj.itemID = 0  # hack to remove from DB. See GH issue #324
+            self.remove(oldObj)
 
-    def remove(self, implant):
-        HandledList.remove(self, implant)
-        del self.__slotCache[implant.slot]
-        # While we deleted this implant, in edge case seems like not all references
-        # to it are removed and object still lives in session; forcibly remove it,
-        # or otherwise when adding the same booster twice booster's table (typeID, fitID)
-        # constraint will report database integrity error
-        # TODO: make a proper fix, probably by adjusting fit-boosters sqlalchemy relationships
-        eos.db.remove(implant)
-
-    def freeSlot(self, slot):
-        if hasattr(slot, "slot"):
-            slot = slot.slot
-
-        try:
-            implant = self.__slotCache[slot]
-        except KeyError:
-            return False
-        try:
-            self.remove(implant)
-        except ValueError:
-            return False
-        return True
+        HandledList.append(self, thing)
 
 class HandledProjectedModList(HandledList):
+    def append(self, proj):
+        if proj.isInvalid:
+            # we must include it before we remove it. doing it this way ensures
+            # rows and relationships in database are removed as well
+            HandledList.append(self, proj)
+            self.remove(proj)
+            return
+
+        proj.projected = True
+        isSystemEffect = proj.item.group.name == "Effect Beacon"
+
+        if isSystemEffect:
+            # remove other system effects - only 1 per fit plz
+            oldEffect = next((m for m in self if m.item.group.name == "Effect Beacon"), None)
+
+            if oldEffect:
+                logging.info("System effect occupied with %s, replacing with %s", oldEffect.item.name, proj.item.name)
+                self.remove(oldEffect)
+
+        HandledList.append(self, proj)
+
+        # Remove non-projectable modules
+        if not proj.item.isType("projected") and not isSystemEffect:
+            self.remove(proj)
+
+class HandledProjectedDroneList(HandledDroneCargoList):
     def append(self, proj):
         proj.projected = True
         HandledList.append(self, proj)
 
-class HandledProjectedDroneList(HandledDroneList):
-    def append(self, proj):
-        proj.projected = True
-        list.append(self, proj)
-
-class HandledProjectedFitList(HandledList):
-    def append(self, proj):
-        proj.projected = True
-        list.append(self, proj)
+        # Remove invalid or non-projectable drones
+        if proj.isInvalid or not proj.item.isType("projected"):
+            self.remove(proj)
 
 class HandledItem(object):
     def preAssignItemAttr(self, *args, **kwargs):

eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
+#
 # Used by:
 # Modules named like: Dynamic Fuel Valve (8 of 8)
 type = "passive"

eos/effects/accerationcontrolskillabmwdspeedboost.py

@@ -1,3 +1,5 @@
+# accerationControlSkillAb&MwdSpeedBoost
+#
 # Used by:
 # Implant: Zor's Custom Navigation Hyper-Link
 # Skill: Acceleration Control

eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
 type = "passive"

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringArchaelogy
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringHacking
+#
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005

eos/effects/adaptivearmorhardener.py

@@ -1,3 +1,5 @@
+# adaptiveArmorHardener
+#
 # Used by:
 # Module: Reactive Armor Hardener
 type = "active"

eos/effects/addtosignatureradius2.py

@@ -1,5 +1,8 @@
+# addToSignatureRadius2
+#
 # Used by:
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Missile Launcher Bomb (2 of 2)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))

eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py

@@ -1,3 +1,5 @@
+# advancedDroneInterfacingMaxGroupDCUSkillLevel
+#
 # Used by:
 # Skill: Advanced Drone Interfacing
 type = "passive"

eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py

@@ -1,3 +1,5 @@
+# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
 # Implant: Zor's Custom Navigation Link

eos/effects/agilitymultipliereffect.py

@@ -1,7 +1,9 @@
+# agilityMultiplierEffect
+#
 # Used by:
-# Modules from group: Inertia Stabilizer (12 of 12)
-# Modules from group: Nanofiber Internal Structure (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Inertial Stabilizer (7 of 7)
+# Modules from group: Nanofiber Internal Structure (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("agility",

eos/effects/agilitymultipliereffectpassive.py

@@ -1,3 +1,5 @@
+# agilityMultiplierEffectPassive
+#
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"

eos/effects/ammofallofmultiplier.py

@@ -1,3 +1,5 @@
+# ammoFallofMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/ammoinfluencecapneed.py

@@ -1,5 +1,7 @@
+# ammoInfluenceCapNeed
+#
 # Used by:
-# Items from category: Charge (458 of 828)
+# Items from category: Charge (458 of 833)
 type = "passive"
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster

eos/effects/ammoinfluencerange.py

@@ -1,5 +1,7 @@
+# ammoInfluenceRange
+#
 # Used by:
-# Items from category: Charge (559 of 828)
+# Items from category: Charge (559 of 833)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/ammospeedmultiplier.py

@@ -1,7 +1,9 @@
+# ammoSpeedMultiplier
+#
 # Used by:
 # Charges from group: Festival Charges (8 of 8)
+# Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
-# Charge: Warp Disrupt Probe
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)

eos/effects/ammotrackingmultiplier.py

@@ -1,3 +1,5 @@
+# ammoTrackingMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/angelsetbonus.py

@@ -1,3 +1,5 @@
+# angelsetbonus
+#
 # Used by:
 # Implants named like: grade Halo (18 of 18)
 runTime = "early"

eos/effects/antiwarpscramblingpassive.py

@@ -1,3 +1,5 @@
+# antiWarpScramblingPassive
+#
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"

eos/effects/archaeologyskillvirusbonus.py

@@ -1,3 +1,5 @@
+# archaeologySkillVirusBonus
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -1,3 +1,5 @@
+# armorAllRepairSystemsAmountBonusPassive
+#
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
 type = "passive"

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

@@ -1,7 +1,9 @@
+# armorDamageAmountBonusCapitalArmorRepairers
+#
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)

eos/effects/armoredsquadroncommand.py

@@ -1,3 +1,5 @@
+# armoredSquadronCommand
+#
 # Used by:
 # Skill: Armored Warfare Specialist
 runTime = "early"

eos/effects/armoredwarfaremindlink.py

@@ -1,3 +1,5 @@
+# armoredWarfareMindlink
+#
 # Used by:
 # Implant: Armored Warfare Mindlink
 # Implant: Federation Navy Warfare Mindlink

eos/effects/armorhpbonusadd.py

@@ -1,5 +1,7 @@
+# armorHPBonusAdd
+#
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))

eos/effects/armorhpbonusaddpassive.py

@@ -1,3 +1,5 @@
+# armorHPBonusAddPassive
+#
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"

eos/effects/armorhpmultiply.py

@@ -1,3 +1,5 @@
+# armorHPMultiply
+#
 # Used by:
 # Modules from group: Armor Coating (202 of 202)
 # Modules from group: Armor Plating Energized (187 of 187)

eos/effects/armorreinforcermassadd.py

@@ -1,5 +1,7 @@
+# armorReinforcerMassAdd
+#
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))

eos/effects/armorrepair.py

@@ -1,3 +1,5 @@
+# armorRepair
+#
 # Used by:
 # Modules from group: Armor Repair Unit (100 of 100)
 runTime = "late"

eos/effects/armorrepairprojectorfalloffbonus.py

@@ -0,0 +1,11 @@
+# armorRepairProjectorFalloffBonus
+#
+# Used by:
+# Variations of ship: Navitas (2 of 2)
+# Ship: Augoror
+# Ship: Deacon
+# Ship: Exequror
+# Ship: Inquisitor
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))

eos/effects/armorrepairprojectormaxrangebonus.py

@@ -1,8 +1,11 @@
+# armorRepairProjectorMaxRangeBonus
+#
 # Used by:
+# Variations of ship: Navitas (2 of 2)
 # Ship: Augoror
+# Ship: Deacon
 # Ship: Exequror
 # Ship: Inquisitor
-# Ship: Navitas
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",

eos/effects/armortankinggang.py

@@ -1,3 +1,5 @@
+# armorTankingGang
+#
 # Used by:
 # Skill: Armored Warfare
 type = "gang"

eos/effects/armortankinggang2.py

@@ -1,10 +0,0 @@
-# Used by:
-# Implant: Armored Warfare Mindlink
-# Implant: Federation Navy Warfare Mindlink
-# Implant: Imperial Navy Warfare Mindlink
-type = "gang", "active"
-gangBonus = "armorHpBonus2"
-gangBoost = "armorHP"
-def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("armorHpBonus2"))

eos/effects/armorupgradesmasspenaltyreductionbonus.py

@@ -1,3 +1,5 @@
+# armorUpgradesMassPenaltyReductionBonus
+#
 # Used by:
 # Skill: Armor Layering
 type = "passive"

eos/effects/armorwarfarearmorhpreplacer.py

@@ -0,0 +1,12 @@
+# armorWarfareArmorHpReplacer
+#
+# Used by:
+# Implant: Armored Warfare Mindlink
+# Implant: Federation Navy Warfare Mindlink
+# Implant: Imperial Navy Warfare Mindlink
+type = "gang", "active"
+gangBonus = "armorHpBonus2"
+gangBoost = "armorHP"
+def handler(fit, module, context):
+    if "gang" not in context: return
+    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("armorHpBonus2"))

eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py

@@ -1,3 +1,5 @@
+# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
+#
 # Used by:
 # Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
 # Implant: Michi's Excavation Augmentor

eos/effects/basemaxscandeviationmodifiermoduleonline2none.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierModuleOnline2None
+#
 # Used by:
 # Variations of module: Scan Pinpointing Array I (2 of 2)
 type = "passive"

eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierRequiringAstrometrics
+#
 # Used by:
 # Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
 # Skill: Astrometric Pinpointing

eos/effects/basesensorstrengthmodifiermodule.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierModule
+#
 # Used by:
 # Variations of module: Scan Rangefinding Array I (2 of 2)
 type = "passive"

eos/effects/basesensorstrengthmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierRequiringAstrometrics
+#
 # Used by:
 # Modules from group: Scan Probe Launcher (4 of 7)
 # Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)

eos/effects/battlecruiserdronespeed.py

@@ -0,0 +1,9 @@
+# battlecruiserDroneSpeed
+#
+# Used by:
+# Ship: Myrmidon
+# Ship: Prophecy
+type = "passive"
+def handler(fit, ship, context):
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermetrange.py

@@ -0,0 +1,10 @@
+# battlecruiserMETRange
+#
+# Used by:
+# Ships named like: Harbinger (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermhtrange.py

@@ -0,0 +1,11 @@
+# battlecruiserMHTRange
+#
+# Used by:
+# Ships named like: Brutix (2 of 2)
+# Ship: Ferox
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermissilerange.py

@@ -0,0 +1,9 @@
+# battlecruiserMissileRange
+#
+# Used by:
+# Ships named like: Drake (2 of 2)
+# Ship: Cyclone
+type = "passive"
+def handler(fit, skill, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermptrange.py

@@ -0,0 +1,10 @@
+# battlecruiserMPTRange
+#
+# Used by:
+# Ships named like: Hurricane (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/bclargeenergyturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargehybridturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargeprojectileturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/bclargeprojectileturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/biologytimebonusfixed.py

@@ -1,3 +1,5 @@
+# biologyTimeBonusFixed
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
 # Skill: Biology

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -1,8 +1,9 @@
+# blockadeRunnerCloakCpuPercentBonus
+#
 # Used by:
 # Ships from group: Blockade Runner (4 of 4)
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Transport Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus") * level)
+                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"), skill="Transport Ships")

eos/effects/boosterarmorhppenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorHpPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorRepairAmountPenalty
+#
 # Used by:
 # Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"

eos/effects/boostercapacitorcapacitypenalty.py

@@ -1,3 +1,5 @@
+# boosterCapacitorCapacityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)

eos/effects/boostermaxvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMaxVelocityPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boostermissileexplosioncloudpenaltyfixed.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionCloudPenaltyFixed
+#
 # Used by:
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)

eos/effects/boostermissileexplosionvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionVelocityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"

eos/effects/boostermissilevelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileVelocityPenalty
+#
 # Used by:
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)

eos/effects/boostermodifyboosterarmorpenalties.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterArmorPenalties
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMaxVelocityAndCapacitorPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermissilepenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMissilePenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostershieldpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterShieldPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboosterturretpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterTurretPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"