diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENSE.md @@ -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: + + {project} Copyright (C) {year} {fullname} + 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>. diff --git a/MainForm.png b/MainForm.png new file mode 100644 index 0000000..3d360bd Binary files /dev/null and b/MainForm.png differ diff --git a/MainSettings2.png b/MainSettings2.png deleted file mode 100644 index f6df2f4..0000000 Binary files a/MainSettings2.png and /dev/null differ diff --git a/MainWindow.png b/MainWindow.png deleted file mode 100644 index 7dd8a00..0000000 Binary files a/MainWindow.png and /dev/null differ diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs index 6926060..b006b0c 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.Designer.cs @@ -48,19 +48,19 @@ this.pkmnDefIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.pkmnStaIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.pkmnIV = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.pkmnCandy = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.pkmnCandyToEvolve = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.pkmnEvolveTimes = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.pkmnTransferButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.pkmnPowerUpButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); this.pkmnEvolveButton = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); + this.cmsPokemonList = new System.Windows.Forms.ContextMenuStrip(this.components); this.largePokemonImageList = new System.Windows.Forms.ImageList(this.components); this.smallPokemonImageList = new System.Windows.Forms.ImageList(this.components); this.btnRefresh = new System.Windows.Forms.Button(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.lblPokemonList = new System.Windows.Forms.Label(); - this.pkmnCandy = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - this.pkmnCandyToEvolve = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - this.pkmnEvolveTimes = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - this.cmsPokemonList = new System.Windows.Forms.ContextMenuStrip(this.components); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.olvPokemonList)).BeginInit(); @@ -85,7 +85,7 @@ this.logTextBox.Location = new System.Drawing.Point(0, 0); this.logTextBox.Name = "logTextBox"; this.logTextBox.ReadOnly = true; - this.logTextBox.Size = new System.Drawing.Size(422, 294); + this.logTextBox.Size = new System.Drawing.Size(554, 268); this.logTextBox.TabIndex = 0; this.logTextBox.Text = ""; this.logTextBox.TextChanged += new System.EventHandler(this.logTextBox_TextChanged); @@ -95,7 +95,7 @@ this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 541); + this.statusStrip1.Location = new System.Drawing.Point(0, 498); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(1254, 22); this.statusStrip1.TabIndex = 1; @@ -104,7 +104,7 @@ // statusLabel // this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(39, 17); + this.statusLabel.Size = new System.Drawing.Size(43, 17); this.statusLabel.Text = "Status"; // // menuStrip1 @@ -117,35 +117,35 @@ this.forceUnbanToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1254, 24); + this.menuStrip1.Size = new System.Drawing.Size(1254, 25); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "menuStrip1"; // // startStopBotToolStripMenuItem // this.startStopBotToolStripMenuItem.Name = "startStopBotToolStripMenuItem"; - this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(77, 20); + this.startStopBotToolStripMenuItem.Size = new System.Drawing.Size(85, 21); this.startStopBotToolStripMenuItem.Text = "▶ Start Bot"; this.startStopBotToolStripMenuItem.Click += new System.EventHandler(this.startStopBotToolStripMenuItem_Click); // // todoToolStripMenuItem // this.todoToolStripMenuItem.Name = "todoToolStripMenuItem"; - this.todoToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.todoToolStripMenuItem.Size = new System.Drawing.Size(66, 21); this.todoToolStripMenuItem.Text = "Settings"; this.todoToolStripMenuItem.Click += new System.EventHandler(this.todoToolStripMenuItem_Click); // // useLuckyEggToolStripMenuItem // this.useLuckyEggToolStripMenuItem.Name = "useLuckyEggToolStripMenuItem"; - this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(95, 20); + this.useLuckyEggToolStripMenuItem.Size = new System.Drawing.Size(105, 21); this.useLuckyEggToolStripMenuItem.Text = "Use Lucky Egg"; this.useLuckyEggToolStripMenuItem.Click += new System.EventHandler(this.useLuckyEggToolStripMenuItem_Click); // // forceUnbanToolStripMenuItem // this.forceUnbanToolStripMenuItem.Name = "forceUnbanToolStripMenuItem"; - this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(86, 20); + this.forceUnbanToolStripMenuItem.Size = new System.Drawing.Size(94, 21); this.forceUnbanToolStripMenuItem.Text = "Force Unban"; this.forceUnbanToolStripMenuItem.Click += new System.EventHandler(this.forceUnbanToolStripMenuItem_Click); // @@ -183,7 +183,7 @@ this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(416, 216); + this.gMapControl1.Size = new System.Drawing.Size(548, 195); this.gMapControl1.TabIndex = 23; this.gMapControl1.Zoom = 0D; // @@ -228,7 +228,7 @@ this.olvPokemonList.Name = "olvPokemonList"; this.olvPokemonList.RowHeight = 32; this.olvPokemonList.ShowGroups = false; - this.olvPokemonList.Size = new System.Drawing.Size(822, 464); + this.olvPokemonList.Size = new System.Drawing.Size(690, 425); this.olvPokemonList.SmallImageList = this.smallPokemonImageList; this.olvPokemonList.TabIndex = 25; this.olvPokemonList.UseCompatibleStateImageBehavior = false; @@ -245,31 +245,50 @@ // this.pkmnCP.AspectName = "Cp"; this.pkmnCP.Text = "CP"; - this.pkmnCP.Width = 50; + this.pkmnCP.Width = 40; // // pkmnAtkIV // this.pkmnAtkIV.AspectName = "IndividualAttack"; this.pkmnAtkIV.Text = "Atk IV"; - this.pkmnAtkIV.Width = 50; + this.pkmnAtkIV.Width = 45; // // pkmnDefIV // this.pkmnDefIV.AspectName = "IndividualDefense"; this.pkmnDefIV.Text = "Def IV"; - this.pkmnDefIV.Width = 50; + this.pkmnDefIV.Width = 45; // // pkmnStaIV // this.pkmnStaIV.AspectName = "IndividualStamina"; this.pkmnStaIV.Text = "Sta IV"; - this.pkmnStaIV.Width = 50; + this.pkmnStaIV.Width = 45; // // pkmnIV // this.pkmnIV.AspectName = "GetIV"; this.pkmnIV.AspectToStringFormat = "{0:P2}"; this.pkmnIV.Text = "IV %"; + this.pkmnIV.Width = 51; + // + // pkmnCandy + // + this.pkmnCandy.AspectName = "Candy"; + this.pkmnCandy.Text = "Candy"; + this.pkmnCandy.Width = 46; + // + // pkmnCandyToEvolve + // + this.pkmnCandyToEvolve.AspectName = "CandyToEvolve"; + this.pkmnCandyToEvolve.Text = "CtE"; + this.pkmnCandyToEvolve.Width = 31; + // + // pkmnEvolveTimes + // + this.pkmnEvolveTimes.AspectName = "EvolveTimes"; + this.pkmnEvolveTimes.Text = "# Evolves"; + this.pkmnEvolveTimes.Width = 66; // // pkmnTransferButton // @@ -295,6 +314,12 @@ this.pkmnEvolveButton.IsButton = true; this.pkmnEvolveButton.Text = ""; // + // cmsPokemonList + // + this.cmsPokemonList.Name = "cmsPokemonList"; + this.cmsPokemonList.ShowImageMargin = false; + this.cmsPokemonList.Size = new System.Drawing.Size(36, 4); + // // largePokemonImageList // this.largePokemonImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit; @@ -313,9 +338,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.btnRefresh.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.btnRefresh.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnRefresh.Location = new System.Drawing.Point(3, 486); + this.btnRefresh.Location = new System.Drawing.Point(3, 445); this.btnRefresh.Name = "btnRefresh"; - this.btnRefresh.Size = new System.Drawing.Size(822, 28); + this.btnRefresh.Size = new System.Drawing.Size(690, 26); this.btnRefresh.TabIndex = 26; this.btnRefresh.Text = "Refresh"; this.btnRefresh.UseVisualStyleBackColor = true; @@ -324,7 +349,7 @@ // splitContainer1 // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 24); + this.splitContainer1.Location = new System.Drawing.Point(0, 25); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -336,8 +361,8 @@ this.splitContainer1.Panel2.Controls.Add(this.lblPokemonList); this.splitContainer1.Panel2.Controls.Add(this.olvPokemonList); this.splitContainer1.Panel2.Controls.Add(this.btnRefresh); - this.splitContainer1.Size = new System.Drawing.Size(1254, 517); - this.splitContainer1.SplitterDistance = 422; + this.splitContainer1.Size = new System.Drawing.Size(1254, 473); + this.splitContainer1.SplitterDistance = 554; this.splitContainer1.TabIndex = 27; // // splitContainer2 @@ -354,8 +379,8 @@ // splitContainer2.Panel2 // this.splitContainer2.Panel2.Controls.Add(this.gMapControl1); - this.splitContainer2.Size = new System.Drawing.Size(422, 517); - this.splitContainer2.SplitterDistance = 294; + this.splitContainer2.Size = new System.Drawing.Size(554, 473); + this.splitContainer2.SplitterDistance = 268; this.splitContainer2.TabIndex = 0; // // lblPokemonList @@ -363,40 +388,18 @@ this.lblPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lblPokemonList.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPokemonList.Location = new System.Drawing.Point(3, 470); + this.lblPokemonList.Location = new System.Drawing.Point(3, 431); this.lblPokemonList.Name = "lblPokemonList"; - this.lblPokemonList.Size = new System.Drawing.Size(822, 13); + this.lblPokemonList.Size = new System.Drawing.Size(690, 11); this.lblPokemonList.TabIndex = 27; this.lblPokemonList.Text = "0 / 0"; this.lblPokemonList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // pkmnCandy - // - this.pkmnCandy.AspectName = "Candy"; - this.pkmnCandy.Text = "Candy"; - // - // pkmnCandyToEvolve - // - this.pkmnCandyToEvolve.AspectName = "CandyToEvolve"; - this.pkmnCandyToEvolve.Text = "CtE"; - // - // pkmnEvolveTimes - // - this.pkmnEvolveTimes.AspectName = "EvolveTimes"; - this.pkmnEvolveTimes.Text = "# Evolves"; - this.pkmnEvolveTimes.Width = 70; - // - // cmsPokemonList - // - this.cmsPokemonList.Name = "cmsPokemonList"; - this.cmsPokemonList.ShowImageMargin = false; - this.cmsPokemonList.Size = new System.Drawing.Size(36, 4); - // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1254, 563); + this.ClientSize = new System.Drawing.Size(1254, 520); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/PokemonGo/RocketAPI/Window/MainForm.cs index e939cf3..4941fa6 100644 --- a/PokemonGo/RocketAPI/Window/MainForm.cs +++ b/PokemonGo/RocketAPI/Window/MainForm.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Drawing; using System.IO; using System.Linq; using System.Net; -using System.Reflection; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; @@ -27,7 +27,6 @@ using POGOProtos.Map.Fort; using POGOProtos.Map.Pokemon; using POGOProtos.Networking.Responses; using static System.Reflection.Assembly; -using System.ComponentModel; namespace PokemonGo.RocketAPI.Window { @@ -48,19 +47,20 @@ namespace PokemonGo.RocketAPI.Window public static DateTime InitSessionDateTime = DateTime.Now; private static bool _botStarted; + private readonly GMapOverlay _playerOverlay = new GMapOverlay("players"); + private readonly GMapOverlay _pokemonsOverlay = new GMapOverlay("pokemons"); + private readonly GMapOverlay _pokestopsOverlay = new GMapOverlay("pokestops"); + + private readonly GMapOverlay _searchAreaOverlay = new GMapOverlay("areas"); private Client _client; private Client _client2; private LocationManager _locationManager; + private bool _initialized; private GMarkerGoogle _playerMarker; - private readonly GMapOverlay _playerOverlay = new GMapOverlay("players"); - private readonly GMapOverlay _pokemonsOverlay = new GMapOverlay("pokemons"); private IEnumerable<FortData> _pokeStops; - private readonly GMapOverlay _pokestopsOverlay = new GMapOverlay("pokestops"); - - private readonly GMapOverlay _searchAreaOverlay = new GMapOverlay("areas"); private IEnumerable<WildPokemon> _wildPokemons; public MainForm() @@ -99,6 +99,7 @@ namespace PokemonGo.RocketAPI.Window InitializeMap(); InitializePokemonForm(); + CheckVersion(); } public void Restart() @@ -152,7 +153,7 @@ namespace PokemonGo.RocketAPI.Window match.Groups[3], match.Groups[4])); // makes sense to display your version and say what the current one is on github - ColoredConsoleWrite(Color.Green, "Your version is " + Assembly.GetExecutingAssembly().GetName().Version); + ColoredConsoleWrite(Color.Green, "Your version is " + GetExecutingAssembly().GetName().Version); ColoredConsoleWrite(Color.Green, "Github version is " + gitVersion); ColoredConsoleWrite(Color.Green, "You can find it at www.GitHub.com/1461748123/Pokemon-Go-Rocket-API/releases"); @@ -257,7 +258,7 @@ namespace PokemonGo.RocketAPI.Window } } - private async void Execute() + private async Task Execute() { _client = new Client(ClientSettings, new ApiFailureStrategy()); _locationManager = new LocationManager(_client, ClientSettings.TravelSpeed); @@ -275,14 +276,68 @@ namespace PokemonGo.RocketAPI.Window await _client.Login.DoLogin(); var profile = await _client.Player.GetPlayer(); - var settings = await _client.Download.GetSettings(); - var mapObjects = await _client.Map.GetMapObjects(); + //var settings = await _client.Download.GetSettings(); + //var mapObjects = await _client.Map.GetMapObjects(); var inventory = await _client.Inventory.GetInventory(); var pokemons = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PokemonData) .Where(p => p != null && p?.PokemonId > 0); - updateUserStatusBar(_client); + if (!_initialized) + { + new Thread(new ThreadStart(async () => + { + while (true) + { + if (_botStarted) + { + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).Where(i => i != null).ToArray(); + short hoursLeft = 0; + short minutesLeft = 0; + var secondsLeft = 0; + double xpSec = 0; + var v = stats.First(); + if (v != null) + { + var XpDiff = GetXpDiff(_client, v.Level); + //Calculating the exp needed to level up + float expNextLvl = v.NextLevelXp - v.Experience; + //Calculating the exp made per second + xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60; + //Calculating the seconds left to level up + if (xpSec != 0) + secondsLeft = Convert.ToInt32(expNextLvl / xpSec); + //formatting data to make an output like DateFormat + while (secondsLeft > 60) + { + secondsLeft -= 60; + if (minutesLeft < 60) + { + minutesLeft++; + } + else + { + minutesLeft = 0; + hoursLeft++; + } + } + + SetStatusText( + string.Format( + profile.PlayerData.Username + + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, + _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, + v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + + " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " + + Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + + ":" + secondsLeft); + } + } + await Task.Delay(1000); + } + })).Start(); + _initialized = true; + } // Write the players ingame details ColoredConsoleWrite(Color.Yellow, "----------------------------"); @@ -354,13 +409,13 @@ namespace PokemonGo.RocketAPI.Window if (ClientSettings.EvolveAllGivenPokemons) await EvolveAllGivenPokemons(_client, pokemons); if (ClientSettings.Recycler) - RecycleItems(_client); + await RecycleItems(_client); //client.RecycleItems(client); if (ClientSettings.TravelSpeed > 30) ColoredConsoleWrite(Color.Red, "WARNING: You are travelling over 30km/h. Your ip might get flag!"); - await Task.Delay(5000); - PrintLevel(_client); + //await Task.Delay(5000); + await PrintLevel(_client); await ExecuteFarmingPokestopsAndPokemons(_client); @@ -368,13 +423,24 @@ namespace PokemonGo.RocketAPI.Window await Task.Delay(25); // await ForceUnban(client); - if (!_stopping) - { - ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 5 seconds."); - await Task.Delay(5000); - Execute(); - } - else + //if (!_stopping) + //{ + // ColoredConsoleWrite(Color.Red, $"No nearby useful locations found. Please wait 5 seconds."); + // await Task.Delay(5000); + // Execute(); + //} + //else + //{ + // ConsoleClear(); + // _pokestopsOverlay.Routes.Clear(); + // _pokestopsOverlay.Markers.Clear(); + // ColoredConsoleWrite(Color.Red, $"Bot successfully stopped."); + // startStopBotToolStripMenuItem.Text = "Start"; + // _stopping = false; + // _botStarted = false; + // _pokeStops = null; + //} + if (_stopping) { ConsoleClear(); _pokestopsOverlay.Routes.Clear(); @@ -389,32 +455,32 @@ namespace PokemonGo.RocketAPI.Window catch (TaskCanceledException) { ColoredConsoleWrite(Color.Red, "Task Canceled Exception - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (UriFormatException) { ColoredConsoleWrite(Color.Red, "System URI Format Exception - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (ArgumentOutOfRangeException) { ColoredConsoleWrite(Color.Red, "ArgumentOutOfRangeException - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (ArgumentNullException) { ColoredConsoleWrite(Color.Red, "Argument Null Refference - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (NullReferenceException) { ColoredConsoleWrite(Color.Red, "Null Refference - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (AccessTokenExpiredException) { ColoredConsoleWrite(Color.Red, "Access Token Expired - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (GoogleException ex) { @@ -427,13 +493,13 @@ namespace PokemonGo.RocketAPI.Window catch (InvalidResponseException) { ColoredConsoleWrite(Color.Red, "Invalid response - Restarting"); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } catch (Exception ex) { ColoredConsoleWrite(Color.Red, ex.ToString()); - if (!_stopping) Execute(); + //if (!_stopping) Execute(); } } @@ -576,7 +642,8 @@ namespace PokemonGo.RocketAPI.Window } _farmingPokemons = false; - await Task.Delay(3000); + //await Task.Delay(3000); + await Task.Delay(500); } pokemons = null; } @@ -700,8 +767,8 @@ namespace PokemonGo.RocketAPI.Window _farmingStops = false; if (!_forceUnbanning && !_stopping) { - RecycleItems(client); - await ExecuteFarmingPokestopsAndPokemons(client); + await RecycleItems(client); + //await ExecuteFarmingPokestopsAndPokemons(client); } } @@ -739,16 +806,23 @@ namespace PokemonGo.RocketAPI.Window { var fortSearch = await client.Fort.SearchFort(pokeStop.Id, pokeStop.Latitude, pokeStop.Longitude); - if (fortSearch.ExperienceAwarded == 0) + if (fortSearch.Result == FortSearchResponse.Types.Result.Success) { - ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + if (fortSearch.ExperienceAwarded == 0) + { + ColoredConsoleWrite(Color.LightGreen, "Attempt: " + i); + } + else + { + ColoredConsoleWrite(Color.LightGreen, + "Fuck yes, you are now unbanned! Total attempts: " + i); + done = true; + break; + } } else { - ColoredConsoleWrite(Color.LightGreen, - "Fuck yes, you are now unbanned! Total attempts: " + i); - done = true; - break; + ColoredConsoleWrite(Color.LightGreen, $"Pokestop error on attempt {i}: {fortSearch.Result}"); } } if (done) @@ -1006,7 +1080,7 @@ namespace PokemonGo.RocketAPI.Window public async Task PrintLevel(Client client) { var inventory = await client.Inventory.GetInventory(); - var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray(); + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats); foreach (var v in stats) if (v != null) { @@ -1027,8 +1101,9 @@ namespace PokemonGo.RocketAPI.Window if (ClientSettings.LevelOutput == "levelup") await Task.Delay(1000); else + await Task.Delay(ClientSettings.LevelTimeInterval * 1000); - PrintLevel(client); + // PrintLevel(client); } // Pulled from NecronomiconCoding @@ -1037,52 +1112,49 @@ namespace PokemonGo.RocketAPI.Window return (DateTime.Now - InitSessionDateTime).ToString(@"dd\.hh\:mm\:ss"); } - public async Task updateUserStatusBar(Client client) + public async Task updateUserStatusBar(Client client, GetInventoryResponse inventory, GetPlayerResponse profile) { - var inventory = await client.Inventory.GetInventory(); - var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).ToArray(); - var profile = await client.Player.GetPlayer(); + var stats = inventory.InventoryDelta.InventoryItems.Select(i => i.InventoryItemData?.PlayerStats).Where(i => i != null).ToArray(); short hoursLeft = 0; short minutesLeft = 0; var secondsLeft = 0; double xpSec = 0; - foreach (var v in stats) - if (v != null) + var v = stats.First(); + if (v != null) + { + var XpDiff = GetXpDiff(client, v.Level); + //Calculating the exp needed to level up + float expNextLvl = v.NextLevelXp - v.Experience; + //Calculating the exp made per second + xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60; + //Calculating the seconds left to level up + if (xpSec != 0) + secondsLeft = Convert.ToInt32(expNextLvl / xpSec); + //formatting data to make an output like DateFormat + while (secondsLeft > 60) { - var XpDiff = GetXpDiff(client, v.Level); - //Calculating the exp needed to level up - float expNextLvl = v.NextLevelXp - v.Experience; - //Calculating the exp made per second - xpSec = Math.Round(_totalExperience / GetRuntime()) / 60 / 60; - //Calculating the seconds left to level up - if (xpSec != 0) - secondsLeft = Convert.ToInt32(expNextLvl / xpSec); - //formatting data to make an output like DateFormat - while (secondsLeft > 60) + secondsLeft -= 60; + if (minutesLeft < 60) { - secondsLeft -= 60; - if (minutesLeft < 60) - { - minutesLeft++; - } - else - { - minutesLeft = 0; - hoursLeft++; - } + minutesLeft++; + } + else + { + minutesLeft = 0; + hoursLeft++; } - SetStatusText( - string.Format( - profile.PlayerData.Username + - " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, - _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, - v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + - " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " + - Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + - ":" + secondsLeft); } + SetStatusText( + string.Format( + profile.PlayerData.Username + + " | Level: {0:0} - ({2:0} / {3:0}) | Runtime {1} | Stardust: {4:0}", v.Level, + _getSessionRuntimeInTimeFormat(), v.Experience - v.PrevLevelXp - XpDiff, + v.NextLevelXp - v.PrevLevelXp - XpDiff, profile.PlayerData.Currencies.ToArray()[1].Amount) + + " | XP/Hour: " + Math.Round(_totalExperience / GetRuntime()) + " | Pokemon/Hour: " + + Math.Round(_totalPokemon / GetRuntime()) + " | NextLevel in: " + hoursLeft + ":" + minutesLeft + + ":" + secondsLeft); + } await Task.Delay(1000); - updateUserStatusBar(client); } public static int GetXpDiff(Client client, int Level) @@ -1200,22 +1272,29 @@ namespace PokemonGo.RocketAPI.Window { _botStarted = true; startStopBotToolStripMenuItem.Text = "■ Stop Bot"; - Task.Run(() => + Task.Run(async () => { - try + //CheckVersion(); + while (true) { - //ColoredConsoleWrite(ConsoleColor.White, "Coded by Ferox - edited by NecronomiconCoding"); - CheckVersion(); - Execute(); - } - catch (PtcOfflineException) - { - ColoredConsoleWrite(Color.Red, - "PTC Servers are probably down OR your credentials are wrong. Try google"); - } - catch (Exception ex) - { - ColoredConsoleWrite(Color.Red, $"Unhandled exception: {ex}"); + try + { + //ColoredConsoleWrite(ConsoleColor.White, "Coded by Ferox - edited by NecronomiconCoding"); + if (!_botStarted) + { + break; + } + await Execute(); + } + catch (PtcOfflineException) + { + ColoredConsoleWrite(Color.Red, + "PTC Servers are probably down OR your credentials are wrong. Try google"); + } + catch (Exception ex) + { + ColoredConsoleWrite(Color.Red, $"Unhandled exception: {ex}"); + } } }); } @@ -1357,7 +1436,8 @@ namespace PokemonGo.RocketAPI.Window return key; }; - olvPokemonList.FormatRow += delegate (object sender, FormatRowEventArgs e) { + olvPokemonList.FormatRow += delegate (object sender, FormatRowEventArgs e) + { var pok = e.Model as PokemonObject; if ( olvPokemonList.Objects.Cast<PokemonObject>() @@ -1366,14 +1446,17 @@ namespace PokemonGo.RocketAPI.Window .Count() > 1) e.Item.BackColor = Color.LightGreen; - foreach (OLVListSubItem sub in e.Item.SubItems) { - if (sub.Text.Equals("Evolve") && !pok.CanEvolve) { + foreach (OLVListSubItem sub in e.Item.SubItems) + { + if (sub.Text.Equals("Evolve") && !pok.CanEvolve) + { sub.CellPadding = new Rectangle(100, 100, 0, 0); } } }; - cmsPokemonList.Opening += delegate (object sender, CancelEventArgs e) { + cmsPokemonList.Opening += delegate (object sender, CancelEventArgs e) + { e.Cancel = false; cmsPokemonList.Items.Clear(); @@ -1385,7 +1468,8 @@ namespace PokemonGo.RocketAPI.Window .Count() == 0; var count = pokemons.Count(); - if (count < 1) { + if (count < 1) + { e.Cancel = true; return; } @@ -1398,14 +1482,16 @@ namespace PokemonGo.RocketAPI.Window item.Click += delegate { TransferPokemon(pokemons); }; cmsPokemonList.Items.Add(item); - if (canAllEvolve) { + if (canAllEvolve) + { item = new ToolStripMenuItem(); item.Text = "Evolve " + count + " pokemon"; item.Click += delegate { EvolvePokemon(pokemons); }; cmsPokemonList.Items.Add(item); } - if (count == 1) { + if (count == 1) + { item = new ToolStripMenuItem(); item.Text = "PowerUp"; item.Click += delegate { PowerUpPokemon(pokemons); }; @@ -1415,30 +1501,22 @@ namespace PokemonGo.RocketAPI.Window item = new ToolStripMenuItem(); item.Text = "Transfer Clean Up (Keep highest IV)"; - item.Click += delegate { - CleanUpTransferPokemon(pokemonObject, "IV"); - }; + item.Click += delegate { CleanUpTransferPokemon(pokemonObject, "IV"); }; cmsPokemonList.Items.Add(item); item = new ToolStripMenuItem(); item.Text = "Transfer Clean Up (Keep highest CP)"; - item.Click += delegate { - CleanUpTransferPokemon(pokemonObject, "CP"); - }; + item.Click += delegate { CleanUpTransferPokemon(pokemonObject, "CP"); }; cmsPokemonList.Items.Add(item); item = new ToolStripMenuItem(); item.Text = "Evolve Clean Up (Highest IV)"; - item.Click += delegate { - CleanUpEvolvePokemon(pokemonObject, "IV"); - }; + item.Click += delegate { CleanUpEvolvePokemon(pokemonObject, "IV"); }; cmsPokemonList.Items.Add(item); item = new ToolStripMenuItem(); item.Text = "Evolve Clean Up (Highest CP)"; - item.Click += delegate { - CleanUpEvolvePokemon(pokemonObject, "CP"); - }; + item.Click += delegate { CleanUpEvolvePokemon(pokemonObject, "CP"); }; cmsPokemonList.Items.Add(item); /* cmsPokemonList.Items.Add(separator); @@ -1463,7 +1541,8 @@ namespace PokemonGo.RocketAPI.Window return (Image)Properties.Resources.ResourceManager.GetObject("Pokemon_" + pokemonId); } - private void SetState(bool state) { + private void SetState(bool state) + { btnRefresh.Enabled = state; olvPokemonList.Enabled = state; //flpItems.Enabled = state; @@ -1497,11 +1576,12 @@ namespace PokemonGo.RocketAPI.Window .OrderByDescending(p => p.FamilyId); var pokemonObjects = new List<PokemonObject>(); - foreach (var pokemon in pokemons) { + foreach (var pokemon in pokemons) + { var pokemonObject = new PokemonObject(pokemon); - var family = - families.Where(i => (int) i.FamilyId <= (int) pokemon.PokemonId) - .First(); + var family = + families.Where(i => (int)i.FamilyId <= (int)pokemon.PokemonId) + .First(); pokemonObject.Candy = family.Candy_; pokemonObjects.Add(pokemonObject); } @@ -1573,12 +1653,16 @@ namespace PokemonGo.RocketAPI.Window private async void TransferPokemon(IEnumerable<PokemonData> pokemons) { SetState(false); - foreach (var pokemon in pokemons) { + foreach (var pokemon in pokemons) + { var transferPokemonResponse = await _client2.Inventory.TransferPokemon(pokemon.Id); - if (transferPokemonResponse.Result == ReleasePokemonResponse.Types.Result.Success) { + if (transferPokemonResponse.Result == ReleasePokemonResponse.Types.Result.Success) + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} was transferred. {transferPokemonResponse.CandyAwarded} candy awarded"); - } else { + } + else + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be transferred"); } } @@ -1588,11 +1672,15 @@ namespace PokemonGo.RocketAPI.Window private async void PowerUpPokemon(IEnumerable<PokemonData> pokemons) { SetState(false); - foreach (var pokemon in pokemons) { + foreach (var pokemon in pokemons) + { var evolvePokemonResponse = await _client2.Inventory.UpgradePokemon(pokemon.Id); - if (evolvePokemonResponse.Result == UpgradePokemonResponse.Types.Result.Success) { + if (evolvePokemonResponse.Result == UpgradePokemonResponse.Types.Result.Success) + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} successfully upgraded."); - } else { + } + else + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be upgraded"); } } @@ -1602,27 +1690,32 @@ namespace PokemonGo.RocketAPI.Window private async void EvolvePokemon(IEnumerable<PokemonData> pokemons) { SetState(false); - foreach (var pokemon in pokemons) { + foreach (var pokemon in pokemons) + { var evolvePokemonResponse = await _client2.Inventory.EvolvePokemon(pokemon.Id); - if (evolvePokemonResponse.Result == EvolvePokemonResponse.Types.Result.Success) { + if (evolvePokemonResponse.Result == EvolvePokemonResponse.Types.Result.Success) + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} successfully evolved into {evolvePokemonResponse.EvolvedPokemonData.PokemonId}\n{evolvePokemonResponse.ExperienceAwarded} experience awarded\n{evolvePokemonResponse.CandyAwarded} candy awarded"); - - } else { + } + else + { ColoredConsoleWrite(Color.Magenta, $"{pokemon.PokemonId} could not be evolved"); } } ReloadPokemonList(); } - private void CleanUpTransferPokemon(PokemonObject pokemon, string type) { - int ET = pokemon.EvolveTimes; - int pokemonCount = + private void CleanUpTransferPokemon(PokemonObject pokemon, string type) + { + var ET = pokemon.EvolveTimes; + var pokemonCount = olvPokemonList.Objects.Cast<PokemonObject>() - .Where(p => p.PokemonId == pokemon.PokemonId) - .Count(); + .Where(p => p.PokemonId == pokemon.PokemonId) + .Count(); - if (pokemonCount < ET) { + if (pokemonCount < ET) + { ReloadPokemonList(); return; } @@ -1630,55 +1723,63 @@ namespace PokemonGo.RocketAPI.Window if (ET == 0) ET = 1; - if (type.Equals("IV")) { + if (type.Equals("IV")) + { var pokemons = olvPokemonList.Objects.Cast<PokemonObject>() - .Where(p => p.PokemonId == pokemon.PokemonId) - .Select(p => p.PokemonData) - .OrderBy(p => p.Cp) - .OrderBy(p => p.GetIV()) - .Take(pokemonCount - ET); + .Where(p => p.PokemonId == pokemon.PokemonId) + .Select(p => p.PokemonData) + .OrderBy(p => p.Cp) + .OrderBy(p => p.GetIV()) + .Take(pokemonCount - ET); TransferPokemon(pokemons); - } else if (type.Equals("CP")) { + } + else if (type.Equals("CP")) + { var pokemons = olvPokemonList.Objects.Cast<PokemonObject>() - .Where(p => p.PokemonId == pokemon.PokemonId) - .Select(p => p.PokemonData) - .OrderBy(p => p.GetIV()) - .OrderBy(p => p.Cp) - .Take(pokemonCount - ET); + .Where(p => p.PokemonId == pokemon.PokemonId) + .Select(p => p.PokemonData) + .OrderBy(p => p.GetIV()) + .OrderBy(p => p.Cp) + .Take(pokemonCount - ET); TransferPokemon(pokemons); } } - private void CleanUpEvolvePokemon(PokemonObject pokemon, string type) { - int ET = pokemon.EvolveTimes; + private void CleanUpEvolvePokemon(PokemonObject pokemon, string type) + { + var ET = pokemon.EvolveTimes; - if (ET < 1) { + if (ET < 1) + { ReloadPokemonList(); return; } - if (type.Equals("IV")) { + if (type.Equals("IV")) + { var pokemons = olvPokemonList.Objects.Cast<PokemonObject>() - .Where(p => p.PokemonId == pokemon.PokemonId) - .Select(p => p.PokemonData) - .OrderByDescending(p => p.Cp) - .OrderByDescending(p => p.GetIV()) - .Take(ET); + .Where(p => p.PokemonId == pokemon.PokemonId) + .Select(p => p.PokemonData) + .OrderByDescending(p => p.Cp) + .OrderByDescending(p => p.GetIV()) + .Take(ET); EvolvePokemon(pokemons); - } else if (type.Equals("CP")) { + } + else if (type.Equals("CP")) + { var pokemons = olvPokemonList.Objects.Cast<PokemonObject>() - .Where(p => p.PokemonId == pokemon.PokemonId) - .Select(p => p.PokemonData) - .OrderByDescending(p => p.GetIV()) - .OrderByDescending(p => p.Cp) - .Take(ET); + .Where(p => p.PokemonId == pokemon.PokemonId) + .Select(p => p.PokemonData) + .OrderByDescending(p => p.GetIV()) + .OrderByDescending(p => p.Cp) + .Take(ET); EvolvePokemon(pokemons); } @@ -1719,8 +1820,9 @@ namespace PokemonGo.RocketAPI.Window ColoredConsoleWrite(Color.DarkCyan, $"Recycled {item.Count}x {item.ItemId.ToString().Substring(4)}"); await Task.Delay(500); } - await Task.Delay(ClientSettings.RecycleItemsInterval * 1000); - RecycleItems(client); + + //await Task.Delay(ClientSettings.RecycleItemsInterval * 1000); + //RecycleItems(client); } public async Task UseRazzBerry(Client client, ulong encounterId, string spawnPointGuid) diff --git a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs index 25f2f58..780916f 100644 --- a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs +++ b/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.0.1")] +[assembly: AssemblyVersion("1.8.1.1")] [assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/PokemonGo/RocketAPI/Window/Settings.cs b/PokemonGo/RocketAPI/Window/Settings.cs index db7cd76..2d40e62 100644 --- a/PokemonGo/RocketAPI/Window/Settings.cs +++ b/PokemonGo/RocketAPI/Window/Settings.cs @@ -94,7 +94,7 @@ namespace PokemonGo.RocketAPI.Window new KeyValuePair<ItemId, int>(ItemId.ItemMaxPotion, MaxItemMaxPotion) }; - public int RecycleItemsInterval => GetSetting() != string.Empty ? Convert.ToInt16(GetSetting()) : 60; + public int RecycleItemsInterval => GetSetting() != string.Empty ? Convert.ToInt16(GetSetting()) : 0; public string Language => GetSetting() != string.Empty ? GetSetting() : "english"; diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs index e95e991..a0275de 100644 --- a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs +++ b/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs @@ -1,4 +1,5 @@ -namespace PokemonGo.RocketAPI.Window +using System.Drawing; +namespace PokemonGo.RocketAPI.Window { partial class SettingsForm { @@ -69,9 +70,9 @@ // authTypeLabel // this.authTypeLabel.AutoSize = true; - this.authTypeLabel.Location = new System.Drawing.Point(3, 7); + this.authTypeLabel.Location = new System.Drawing.Point(3, 9); this.authTypeLabel.Name = "authTypeLabel"; - this.authTypeLabel.Size = new System.Drawing.Size(71, 12); + this.authTypeLabel.Size = new System.Drawing.Size(70, 15); this.authTypeLabel.TabIndex = 0; this.authTypeLabel.Text = "Login Type:"; this.authTypeLabel.Click += new System.EventHandler(this.authTypeLabel_Click); @@ -82,72 +83,73 @@ this.authTypeCb.Items.AddRange(new object[] { "google", "Ptc"}); - this.authTypeCb.Location = new System.Drawing.Point(82, 4); + this.authTypeCb.Location = new System.Drawing.Point(96, 5); + this.authTypeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.authTypeCb.Name = "authTypeCb"; - this.authTypeCb.Size = new System.Drawing.Size(136, 20); + this.authTypeCb.Size = new System.Drawing.Size(158, 23); this.authTypeCb.TabIndex = 1; this.authTypeCb.SelectedIndexChanged += new System.EventHandler(this.authTypeCb_SelectedIndexChanged); // // UserLabel // this.UserLabel.AutoSize = true; - this.UserLabel.Location = new System.Drawing.Point(3, 33); + this.UserLabel.Location = new System.Drawing.Point(3, 41); this.UserLabel.Name = "UserLabel"; - this.UserLabel.Size = new System.Drawing.Size(59, 12); + this.UserLabel.Size = new System.Drawing.Size(68, 15); this.UserLabel.TabIndex = 2; this.UserLabel.Text = "Username:"; // // PasswordLabel // this.PasswordLabel.AutoSize = true; - this.PasswordLabel.Location = new System.Drawing.Point(3, 57); + this.PasswordLabel.Location = new System.Drawing.Point(3, 71); this.PasswordLabel.Name = "PasswordLabel"; - this.PasswordLabel.Size = new System.Drawing.Size(59, 12); + this.PasswordLabel.Size = new System.Drawing.Size(64, 15); this.PasswordLabel.TabIndex = 3; this.PasswordLabel.Text = "Password:"; // // latLabel // this.latLabel.AutoSize = true; - this.latLabel.Location = new System.Drawing.Point(3, 81); + this.latLabel.Location = new System.Drawing.Point(3, 101); this.latLabel.Name = "latLabel"; - this.latLabel.Size = new System.Drawing.Size(59, 12); + this.latLabel.Size = new System.Drawing.Size(54, 15); this.latLabel.TabIndex = 4; this.latLabel.Text = "Latitude:"; // // longiLabel // this.longiLabel.AutoSize = true; - this.longiLabel.Location = new System.Drawing.Point(3, 105); + this.longiLabel.Location = new System.Drawing.Point(3, 131); this.longiLabel.Name = "longiLabel"; - this.longiLabel.Size = new System.Drawing.Size(65, 12); + this.longiLabel.Size = new System.Drawing.Size(65, 15); this.longiLabel.TabIndex = 5; this.longiLabel.Text = "Longitude:"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 129); + this.label1.Location = new System.Drawing.Point(3, 161); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(95, 12); + this.label1.Size = new System.Drawing.Size(100, 15); this.label1.TabIndex = 6; this.label1.Text = "Razzberry Mode:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 178); + this.label2.Location = new System.Drawing.Point(3, 222); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(89, 12); + this.label2.Size = new System.Drawing.Size(84, 15); this.label2.TabIndex = 7; this.label2.Text = "Transfer Type:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 296); + this.label3.Location = new System.Drawing.Point(3, 370); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(95, 12); + this.label3.Size = new System.Drawing.Size(101, 15); this.label3.TabIndex = 8; this.label3.Text = "Evolve Pokemon:"; this.label3.Click += new System.EventHandler(this.label3_Click); @@ -155,49 +157,53 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 203); + this.label4.Location = new System.Drawing.Point(3, 254); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(83, 12); + this.label4.Size = new System.Drawing.Size(84, 15); this.label4.TabIndex = 9; this.label4.Text = "CP Threshold:"; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(3, 154); + this.label5.Location = new System.Drawing.Point(3, 192); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(113, 12); + this.label5.Size = new System.Drawing.Size(106, 15); this.label5.TabIndex = 10; this.label5.Text = "Razzberry Setting:"; // // UserLoginBox // - this.UserLoginBox.Location = new System.Drawing.Point(82, 31); + this.UserLoginBox.Location = new System.Drawing.Point(96, 39); + this.UserLoginBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.UserLoginBox.Name = "UserLoginBox"; - this.UserLoginBox.Size = new System.Drawing.Size(136, 21); + this.UserLoginBox.Size = new System.Drawing.Size(158, 21); this.UserLoginBox.TabIndex = 11; // // UserPasswordBox // - this.UserPasswordBox.Location = new System.Drawing.Point(82, 57); + this.UserPasswordBox.Location = new System.Drawing.Point(96, 71); + this.UserPasswordBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.UserPasswordBox.Name = "UserPasswordBox"; - this.UserPasswordBox.Size = new System.Drawing.Size(136, 21); + this.UserPasswordBox.Size = new System.Drawing.Size(158, 21); this.UserPasswordBox.TabIndex = 12; // // latitudeText // - this.latitudeText.Location = new System.Drawing.Point(118, 79); + this.latitudeText.Location = new System.Drawing.Point(138, 99); + this.latitudeText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.latitudeText.Name = "latitudeText"; this.latitudeText.ReadOnly = true; - this.latitudeText.Size = new System.Drawing.Size(100, 21); + this.latitudeText.Size = new System.Drawing.Size(116, 21); this.latitudeText.TabIndex = 13; // // longitudeText // - this.longitudeText.Location = new System.Drawing.Point(118, 103); + this.longitudeText.Location = new System.Drawing.Point(138, 129); + this.longitudeText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.longitudeText.Name = "longitudeText"; this.longitudeText.ReadOnly = true; - this.longitudeText.Size = new System.Drawing.Size(100, 21); + this.longitudeText.Size = new System.Drawing.Size(116, 21); this.longitudeText.TabIndex = 14; // // razzmodeCb @@ -206,16 +212,18 @@ this.razzmodeCb.Items.AddRange(new object[] { "probability", "cp"}); - this.razzmodeCb.Location = new System.Drawing.Point(118, 127); + this.razzmodeCb.Location = new System.Drawing.Point(138, 159); + this.razzmodeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.razzmodeCb.Name = "razzmodeCb"; - this.razzmodeCb.Size = new System.Drawing.Size(100, 20); + this.razzmodeCb.Size = new System.Drawing.Size(116, 23); this.razzmodeCb.TabIndex = 15; // // razzSettingText // - this.razzSettingText.Location = new System.Drawing.Point(118, 152); + this.razzSettingText.Location = new System.Drawing.Point(138, 190); + this.razzSettingText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.razzSettingText.Name = "razzSettingText"; - this.razzSettingText.Size = new System.Drawing.Size(100, 21); + this.razzSettingText.Size = new System.Drawing.Size(116, 21); this.razzSettingText.TabIndex = 16; this.razzSettingText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.razzSettingText_KeyPress); // @@ -230,24 +238,27 @@ "Duplicate", "IV Duplicate", "All"}); - this.transferTypeCb.Location = new System.Drawing.Point(118, 176); + this.transferTypeCb.Location = new System.Drawing.Point(138, 220); + this.transferTypeCb.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.transferTypeCb.Name = "transferTypeCb"; - this.transferTypeCb.Size = new System.Drawing.Size(100, 20); + this.transferTypeCb.Size = new System.Drawing.Size(116, 23); this.transferTypeCb.TabIndex = 17; this.transferTypeCb.SelectedIndexChanged += new System.EventHandler(this.transferTypeCb_SelectedIndexChanged); // // transferCpThresText // - this.transferCpThresText.Location = new System.Drawing.Point(118, 202); + this.transferCpThresText.Location = new System.Drawing.Point(138, 252); + this.transferCpThresText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.transferCpThresText.Name = "transferCpThresText"; - this.transferCpThresText.Size = new System.Drawing.Size(100, 21); + this.transferCpThresText.Size = new System.Drawing.Size(116, 21); this.transferCpThresText.TabIndex = 18; this.transferCpThresText.TextChanged += new System.EventHandler(this.transferCpThresText_TextChanged); // // evolveAllChk // this.evolveAllChk.AutoSize = true; - this.evolveAllChk.Location = new System.Drawing.Point(118, 296); + this.evolveAllChk.Location = new System.Drawing.Point(138, 370); + this.evolveAllChk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.evolveAllChk.Name = "evolveAllChk"; this.evolveAllChk.Size = new System.Drawing.Size(15, 14); this.evolveAllChk.TabIndex = 19; @@ -258,9 +269,10 @@ // this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.saveBtn.Location = new System.Drawing.Point(0, 315); + this.saveBtn.Location = new System.Drawing.Point(0, 394); + this.saveBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.saveBtn.Name = "saveBtn"; - this.saveBtn.Size = new System.Drawing.Size(218, 88); + this.saveBtn.Size = new System.Drawing.Size(254, 110); this.saveBtn.TabIndex = 20; this.saveBtn.Text = "Save"; this.saveBtn.UseVisualStyleBackColor = true; @@ -275,7 +287,8 @@ this.gMapControl1.GrayScaleMode = false; this.gMapControl1.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow; this.gMapControl1.LevelsKeepInMemmory = 5; - this.gMapControl1.Location = new System.Drawing.Point(18, 15); + this.gMapControl1.Location = new System.Drawing.Point(21, 19); + this.gMapControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.gMapControl1.MarkersEnabled = true; this.gMapControl1.MaxZoom = 2; this.gMapControl1.MinZoom = 2; @@ -288,7 +301,7 @@ this.gMapControl1.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.gMapControl1.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.gMapControl1.ShowTileGridLines = false; - this.gMapControl1.Size = new System.Drawing.Size(468, 358); + this.gMapControl1.Size = new System.Drawing.Size(546, 448); this.gMapControl1.TabIndex = 22; this.gMapControl1.Zoom = 0D; this.gMapControl1.Load += new System.EventHandler(this.gMapControl1_Load); @@ -301,9 +314,11 @@ this.groupBox1.Controls.Add(this.trackBar); this.groupBox1.Controls.Add(this.gMapControl1); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(233, 8); + this.groupBox1.Location = new System.Drawing.Point(271, 10); + this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(480, 408); + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBox1.Size = new System.Drawing.Size(561, 510); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; this.groupBox1.Text = "Location"; @@ -312,9 +327,10 @@ // this.FindAdressButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.FindAdressButton.Location = new System.Drawing.Point(355, 379); + this.FindAdressButton.Location = new System.Drawing.Point(414, 474); + this.FindAdressButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.FindAdressButton.Name = "FindAdressButton"; - this.FindAdressButton.Size = new System.Drawing.Size(119, 24); + this.FindAdressButton.Size = new System.Drawing.Size(140, 30); this.FindAdressButton.TabIndex = 25; this.FindAdressButton.Text = "Find Location"; this.FindAdressButton.UseVisualStyleBackColor = true; @@ -323,9 +339,10 @@ // AdressBox // this.AdressBox.ForeColor = System.Drawing.Color.Gray; - this.AdressBox.Location = new System.Drawing.Point(18, 379); + this.AdressBox.Location = new System.Drawing.Point(21, 474); + this.AdressBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.AdressBox.Name = "AdressBox"; - this.AdressBox.Size = new System.Drawing.Size(331, 21); + this.AdressBox.Size = new System.Drawing.Size(385, 21); this.AdressBox.TabIndex = 25; this.AdressBox.Text = "Enter an address or a coordinate"; this.AdressBox.Enter += new System.EventHandler(this.AdressBox_Enter); @@ -335,10 +352,11 @@ // this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.trackBar.BackColor = System.Drawing.SystemColors.Info; - this.trackBar.Location = new System.Drawing.Point(432, 15); + this.trackBar.Location = new System.Drawing.Point(505, 19); + this.trackBar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.trackBar.Name = "trackBar"; this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBar.Size = new System.Drawing.Size(45, 96); + this.trackBar.Size = new System.Drawing.Size(45, 120); this.trackBar.TabIndex = 25; this.trackBar.TickStyle = System.Windows.Forms.TickStyle.TopLeft; this.trackBar.Scroll += new System.EventHandler(this.trackBar_Scroll); @@ -373,17 +391,19 @@ this.panel1.Controls.Add(this.UserLoginBox); this.panel1.Controls.Add(this.UserPasswordBox); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; - this.panel1.Location = new System.Drawing.Point(9, 8); + this.panel1.Location = new System.Drawing.Point(10, 10); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(224, 408); + this.panel1.Size = new System.Drawing.Size(261, 510); this.panel1.TabIndex = 26; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // // TravelSpeedBox // - this.TravelSpeedBox.Location = new System.Drawing.Point(118, 251); + this.TravelSpeedBox.Location = new System.Drawing.Point(138, 314); + this.TravelSpeedBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.TravelSpeedBox.Name = "TravelSpeedBox"; - this.TravelSpeedBox.Size = new System.Drawing.Size(100, 21); + this.TravelSpeedBox.Size = new System.Drawing.Size(116, 21); this.TravelSpeedBox.TabIndex = 22; this.TravelSpeedBox.TextChanged += new System.EventHandler(this.textBox1_TextChanged); this.TravelSpeedBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TravelSpeedBox_KeyPress); @@ -391,7 +411,8 @@ // CatchPokemonBox // this.CatchPokemonBox.AutoSize = true; - this.CatchPokemonBox.Location = new System.Drawing.Point(118, 275); + this.CatchPokemonBox.Location = new System.Drawing.Point(138, 344); + this.CatchPokemonBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.CatchPokemonBox.Name = "CatchPokemonBox"; this.CatchPokemonBox.Size = new System.Drawing.Size(15, 14); this.CatchPokemonBox.TabIndex = 26; @@ -401,51 +422,54 @@ // CatchPokemonText // this.CatchPokemonText.AutoSize = true; - this.CatchPokemonText.Location = new System.Drawing.Point(3, 275); + this.CatchPokemonText.Location = new System.Drawing.Point(3, 344); this.CatchPokemonText.Name = "CatchPokemonText"; - this.CatchPokemonText.Size = new System.Drawing.Size(89, 12); + this.CatchPokemonText.Size = new System.Drawing.Size(97, 15); this.CatchPokemonText.TabIndex = 25; this.CatchPokemonText.Text = "Catch Pokemon:"; this.CatchPokemonText.Click += new System.EventHandler(this.label7_Click); // // transferIVThresText // - this.transferIVThresText.Location = new System.Drawing.Point(118, 203); + this.transferIVThresText.Location = new System.Drawing.Point(138, 254); + this.transferIVThresText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.transferIVThresText.Name = "transferIVThresText"; - this.transferIVThresText.Size = new System.Drawing.Size(100, 21); + this.transferIVThresText.Size = new System.Drawing.Size(116, 21); this.transferIVThresText.TabIndex = 24; this.transferIVThresText.TextChanged += new System.EventHandler(this.textBox2_TextChanged); // // TravelSpeedText // this.TravelSpeedText.AutoSize = true; - this.TravelSpeedText.Location = new System.Drawing.Point(3, 254); + this.TravelSpeedText.Location = new System.Drawing.Point(3, 318); this.TravelSpeedText.Name = "TravelSpeedText"; - this.TravelSpeedText.Size = new System.Drawing.Size(113, 12); + this.TravelSpeedText.Size = new System.Drawing.Size(112, 15); this.TravelSpeedText.TabIndex = 23; this.TravelSpeedText.Text = "Travel Speed km/h:"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(3, 203); + this.label6.Location = new System.Drawing.Point(3, 254); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(83, 12); + this.label6.Size = new System.Drawing.Size(78, 15); this.label6.TabIndex = 21; this.label6.Text = "IV Threshold:"; this.label6.Click += new System.EventHandler(this.label6_Click); // // SettingsForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(722, 424); + this.ClientSize = new System.Drawing.Size(842, 530); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel1); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(630, 334); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.MinimumSize = new System.Drawing.Size(732, 408); this.Name = "SettingsForm"; - this.Padding = new System.Windows.Forms.Padding(9, 8, 9, 8); + this.Padding = new System.Windows.Forms.Padding(10, 10, 10, 10); this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Settings"; diff --git a/SettingForm.png b/SettingForm.png new file mode 100644 index 0000000..20312dc Binary files /dev/null and b/SettingForm.png differ
