diff --git a/LICENSE b/LICENSE
index 260ab17..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,674 @@
-MIT License
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
-Copyright (c) 2021 ElCeejo
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Preamble
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
+.
diff --git a/api/api.lua b/api/api.lua
index aad8d6a..24cf508 100644
--- a/api/api.lua
+++ b/api/api.lua
@@ -1135,10 +1135,10 @@ local function get_libri_page(mob_name, player_name)
"label[3.25,9;x" .. def.max_health / 2 .. "]",
-- Net
"item_image[4.25,8.15;1,1;animalia:lasso]",
- "image[4.75,8.75;0.5,0.5;animalia_libri_true_icon.png]",
+ "image[4.75,8.75;0.5,0.5;animalia_libri_" .. tostring(def.catch_with_lasso or false) .. "_icon.png]",
-- Lasso
"item_image[6,8.15;1,1;animalia:net]",
- "image[6.5,8.75;0.5,0.5;animalia_libri_true_icon.png]",
+ "image[6.5,8.75;0.5,0.5;animalia_libri_" .. tostring(def.catch_with_net or false) .. "_icon.png]",
-- Labels
"label[9.5,7.25;" .. minetest.colorize("#383329", "Drops:") .. "]",
"label[14,7.25;" .. minetest.colorize("#383329", "Eats:") .. "]",
diff --git a/api/behaviors.lua b/api/behaviors.lua
index 993b255..1530b99 100644
--- a/api/behaviors.lua
+++ b/api/behaviors.lua
@@ -233,7 +233,7 @@ local function movement_fly(self, pos2)
self._path = creatura.find_path(self, pos, pos2, self.width, self.height, 300, false, true)
end
-- Apply Movement
- self:turn_to(boid_angle or tyaw, turn_rate)
+ self:turn_to(tyaw, turn_rate)
self:set_forward_velocity(speed)
local v_speed = speed * dir.y
local vel = self.object:get_velocity()
@@ -480,7 +480,7 @@ function animalia.action_boid_move(self, pos2, timeout, method)
self:set_action(func)
end
-function animalia.action_boid_walk(self, pos2, timeout, method, speed_factor)
+function animalia.action_boid_walk(self, pos2, timeout, method, speed_factor, anim)
local boids = creatura.get_boid_members(self.object:get_pos(), 12, self.name)
local timer = timeout
local move_init = false
@@ -509,7 +509,7 @@ function animalia.action_boid_walk(self, pos2, timeout, method, speed_factor)
self:halt()
return true
end
- self:move(pos2, method or "creatura:obstacle_avoidance", speed_factor or 1)
+ self:move(pos2, method or "creatura:obstacle_avoidance", speed_factor or 1, anim or "walk")
move_init = true
end
self:set_action(func)
@@ -531,6 +531,20 @@ function animalia.action_swim(self, pos, timeout, method, speed_factor, anim)
self:set_action(func)
end
+function animalia.action_horse_spin(self, speed, anim)
+ local tyaw = random(math.pi * 2)
+ local function func(self)
+ self:set_gravity(-9.8)
+ self:halt()
+ self:animate(anim or "stand")
+ self:turn_to(tyaw, speed)
+ if abs(tyaw - self.object:get_yaw()) < 0.1 then
+ return true
+ end
+ end
+ self:set_action(func)
+end
+
---------------
-- Behaviors --
---------------
@@ -543,50 +557,96 @@ end
creatura.register_utility("animalia:wander", function(self, group)
local idle_time = 3
- local move_probability = 3
- local group_tick = 0
+ local move_probability = 5
local far_from_group = false
+ local group_tick = 1
local function func(self)
local pos = self.object:get_pos()
- local random_goal = vector.new(
- pos.x + random(-4, 4),
- pos.y,
- pos.z + random(-4, 4)
- )
- if group
- and self:timer(3) then
- local range = self.tracking_range * 0.5
- local group_positions = animalia.get_group_positions(self.name, pos, range + 1)
- if #group_positions > 2 then
- local center = animalia.get_average_pos(group_positions)
- if center
- and (vec_dist(random_goal, center) > range
- or vec_dist(pos, center) > range) then
- random_goal = center
- far_from_group = true
- else
- far_from_group = false
- end
- end
- group_tick = 2
- end
if not self:get_action() then
- local node = minetest.get_node(random_goal)
- if minetest.registered_nodes[node.name].drawtype == "liquid"
- or minetest.registered_nodes[node.name].walkable then
- random_goal = nil
- end
+ local goal
+ local move = random(move_probability) < 2
if self.lasso_pos
and vec_dist(pos, self.lasso_pos) > 10 then
- random_goal = self.lasso_pos
+ goal = self.lasso_pos
end
- if (random(move_probability) < 2
- and random_goal)
+ if not goal
+ and move then
+ goal = self:get_wander_pos(1, 2)
+ end
+ if group
+ and goal
+ and group_tick > 3 then
+ local range = self.tracking_range * 0.5
+ local group_positions = animalia.get_group_positions(self.name, pos, range + 1)
+ if #group_positions > 2 then
+ local center = animalia.get_average_pos(group_positions)
+ if center
+ and vec_dist(pos, center) > range * 0.33
+ or vec_dist(goal, center) > range * 0.33 then
+ goal = center
+ far_from_group = true
+ else
+ far_from_group = false
+ end
+ end
+ group_tick = 0
+ end
+ if (move
+ and goal)
or far_from_group then
- creatura.action_walk(self, random_goal)
+ creatura.action_walk(self, goal, 2, "creatura:neighbors")
else
creatura.action_idle(self, idle_time)
end
+ if group then
+ group_tick = group_tick + 1
+ end
+ end
+ end
+ self:set_utility(func)
+end)
+
+creatura.register_utility("animalia:skittish_wander", function(self)
+ local idle_time = 3
+ local move_probability = 3
+ local force_move = false
+ local avoid_tick = 1
+ local function func(self)
+ local pos = self.object:get_pos()
+ if not self:get_action() then
+ local goal
+ local move = random(move_probability) < 2
+ if avoid_tick > 3
+ and move then
+ local range = self.tracking_range * 0.5
+ local player = creatura.get_nearby_player(self)
+ if player then
+ local target_alive, line_of_sight, player_pos = self:get_target(player)
+ if target_alive
+ and line_of_sight
+ and vec_dist(pos, player_pos) < 8 then
+ force_move = true
+ local dir = vec_dir(player_pos, pos)
+ goal = self:get_wander_pos(2, 3, dir)
+ end
+ end
+ avoid_tick = 0
+ end
+ if self.lasso_pos
+ and vec_dist(pos, self.lasso_pos) > 10 then
+ goal = self.lasso_pos
+ end
+ if not goal
+ and move then
+ goal = self:get_wander_pos(4, 4)
+ end
+ if move
+ and goal then
+ creatura.action_walk(self, goal, 3, "creatura:neighbors", 0.35)
+ else
+ creatura.action_idle(self, idle_time)
+ end
+ avoid_tick = avoid_tick + 1
end
end
self:set_utility(func)
@@ -599,20 +659,15 @@ creatura.register_utility("animalia:skittish_boid_wander", function(self)
local force_move = false
local function func(self)
local pos = self.object:get_pos()
- local random_goal = vector.new(
- pos.x + random(-4, 4),
- pos.y,
- pos.z + random(-4, 4)
- )
+ local goal
if self:timer(3) then
local range = self.tracking_range * 0.5
local group_positions = animalia.get_group_positions(self.name, pos, range + 1)
if #group_positions > 2 then
local center = animalia.get_average_pos(group_positions)
if center
- and (vec_dist(random_goal, center) > range
- or vec_dist(pos, center) > range) then
- random_goal = center
+ and vec_dist(pos, center) > range then
+ goal = center
force_move = true
else
force_move = false
@@ -628,27 +683,24 @@ creatura.register_utility("animalia:skittish_boid_wander", function(self)
and line_of_sight
and vec_dist(pos, player_pos) < 8 then
force_move = true
- local dir = vec_dir(pos, player_pos)
- random_goal = vec_add(pos, vec_multi(vec_add(dir, {x = random(-10, 10) * 0.1, y = 0, z = random(-10, 10) * 0.1}), -3))
+ local dir = vec_dir(player_pos, pos)
+ goal = self:get_wander_pos(2, 3, dir)
end
end
end
if not self:get_action() then
- local node = minetest.get_node(random_goal)
- if minetest.registered_nodes[node.name].drawtype == "liquid"
- or minetest.registered_nodes[node.name].walkable then
- random_goal = nil
- force_move = false
- end
+ local move = random(move_probability) < 2
if self.lasso_pos
and vec_dist(pos, self.lasso_pos) > 10 then
- random_goal = self.lasso_pos
+ goal = self.lasso_pos
end
- if (random(move_probability) < 2
- and random_goal)
- or force_move then
- get_ground_level(random_goal, 1)
- animalia.action_boid_walk(self, random_goal, 6, "creatura:obstacle_avoidance", 0.5)
+ if not goal
+ and move then
+ goal = self:get_wander_pos(4, 4)
+ end
+ if move
+ and goal then
+ animalia.action_boid_walk(self, goal, 6, "creatura:neighbors", 0.35)
else
creatura.action_idle(self, idle_time)
end
@@ -657,18 +709,13 @@ creatura.register_utility("animalia:skittish_boid_wander", function(self)
self:set_utility(func)
end)
-
creatura.register_utility("animalia:boid_wander", function(self, group)
local idle_time = 3
local move_probability = 5
local group_tick = 0
local function func(self)
local pos = self.object:get_pos()
- local random_goal = vector.new(
- pos.x + random(-4, 4),
- pos.y,
- pos.z + random(-4, 4)
- )
+ local goal
if group
and self:timer(3) then
local range = self.tracking_range * 0.5
@@ -676,26 +723,25 @@ creatura.register_utility("animalia:boid_wander", function(self, group)
if #group_positions > 2 then
local center = animalia.get_average_pos(group_positions)
if center
- and (vec_dist(random_goal, center) > range
- or vec_dist(pos, center) > range) then
- random_goal = center
+ and vec_dist(pos, center) > range then
+ goal = center
end
end
group_tick = 2
end
if not self:get_action() then
- local node = minetest.get_node(random_goal)
- if minetest.registered_nodes[node.name].drawtype == "liquid"
- or minetest.registered_nodes[node.name].walkable then
- random_goal = nil
- end
+ local move = random(move_probability) < 2
if self.lasso_pos
and vec_dist(pos, self.lasso_pos) > 10 then
- random_goal = self.lasso_pos
+ goal = self.lasso_pos
end
- if random(move_probability) < 2
- and random_goal then
- animalia.action_boid_walk(self, random_goal, 6, "creatura:neighbors", 0.25)
+ if not goal
+ and move then
+ goal = self:get_wander_pos(1, 3)
+ end
+ if move
+ and goal then
+ animalia.action_boid_walk(self, goal, 6, "creatura:neighbors", 0.35)
else
creatura.action_idle(self, idle_time)
end
@@ -731,46 +777,57 @@ end)
-- "Eat" nodes
creatura.register_utility("animalia:eat_from_turf", function(self)
+ local action_init = false
local function func(self)
local pos = self.object:get_pos()
- local under = vector.new(pos.x, pos.y - 1, pos.z)
- for _, node in ipairs(self.consumable_nodes) do
- if node.name == minetest.get_node(under).name then
- minetest.set_node(under, {name = node.replacement})
- local def = minetest.registered_nodes[node.name]
- local texture = def.tiles[1]
- texture = texture .. "^[resize:8x8"
- minetest.add_particlespawner({
- amount = 6,
- time = 0.1,
- minpos = vector.new(
- pos.x - 0.5,
- pos.y + 0.1,
- pos.z - 0.5
- ),
- maxpos = vector.new(
- pos.x + 0.5,
- pos.y + 0.1,
- pos.z + 0.5
- ),
- minvel = {x=-1, y=1, z=-1},
- maxvel = {x=1, y=2, z=1},
- minacc = {x=0, y=-5, z=0},
- maxacc = {x=0, y=-9, z=0},
- minexptime = 1,
- maxexptime = 1,
- minsize = 1,
- maxsize = 2,
- collisiondetection = true,
- vertical = false,
- texture = texture,
- })
- self.gotten = false
- self:memorize("gotten", self.gotten)
- return true
- else
- return true
+ local look_dir = yaw2dir(self.object:get_yaw())
+ local under = vec_add(pos, vec_multi(look_dir, self.width))
+ under.y = pos.y - 0.5
+ if not action_init then
+ for i, node in ipairs(self.consumable_nodes) do
+ if node.name == minetest.get_node(under).name then
+ minetest.set_node(under, {name = node.replacement})
+ local def = minetest.registered_nodes[node.name]
+ local texture = def.tiles[1]
+ texture = texture .. "^[resize:8x8"
+ minetest.add_particlespawner({
+ amount = 6,
+ time = 0.1,
+ minpos = vector.new(
+ pos.x - 0.5,
+ pos.y + 0.1,
+ pos.z - 0.5
+ ),
+ maxpos = vector.new(
+ pos.x + 0.5,
+ pos.y + 0.1,
+ pos.z + 0.5
+ ),
+ minvel = {x=-1, y=1, z=-1},
+ maxvel = {x=1, y=2, z=1},
+ minacc = {x=0, y=-5, z=0},
+ maxacc = {x=0, y=-9, z=0},
+ minexptime = 1,
+ maxexptime = 1,
+ minsize = 1,
+ maxsize = 2,
+ collisiondetection = true,
+ vertical = false,
+ texture = texture,
+ })
+ self.gotten = false
+ self:memorize("gotten", self.gotten)
+ if not self:get_action() then
+ creatura.action_idle(self, 1, "eat")
+ action_init = true
+ end
+ break
+ elseif i == #self.consumable_nodes then
+ return true
+ end
end
+ elseif not self:get_action() then
+ return true
end
end
self:set_utility(func)
@@ -915,7 +972,7 @@ creatura.register_utility("animalia:boid_flee_from_player", function(self, playe
and vec_dist(pos, self.lasso_pos) > 10 then
escape_pos = self.lasso_pos
end
- animalia.action_boid_walk(self, escape_pos, 6, "creatura:obstacle_avoidance", 1)
+ animalia.action_boid_walk(self, escape_pos, 6, "creatura:obstacle_avoidance", 1, "run")
end
if vec_dist(pos, tpos) > self.tracking_range + (#mobs_in_group or 0) then
return true
@@ -1220,7 +1277,7 @@ creatura.register_utility("animalia:aerial_flock", function(self, scale)
or (dist2floor < 2
or dist2ceil < 2) then
local pos = self.object:get_pos()
- local pos2 = self:get_wander_pos_3d(2, range)
+ local pos2 = self:get_wander_pos_3d(1, range)
if dist2ceil < 2 then
pos2.y = pos.y - 1
end
@@ -1518,6 +1575,23 @@ creatura.register_utility("animalia:find_home", function(self)
self:set_utility(func)
end)
+-- Horse Exclusive Behaviors
+
+creatura.register_utility("animalia:horse_breaking", function(self)
+ local timer = 18
+ self:clear_action()
+ local function func(self)
+ if not self:get_action() then
+ animalia.action_horse_spin(self, random(4, 6), "stand")
+ end
+ timer = timer - self.dtime
+ if timer <= 0 then
+ return true
+ end
+ end
+ self:set_utility(func)
+end)
+
-- Tamed Animal Orders
creatura.register_utility("animalia:sit", function(self)
@@ -1558,9 +1632,9 @@ creatura.register_utility("animalia:mount", function(self, player)
speed_factor = speed_factor * 0.5
end
local total_speed = vector.length(vel)
- if total_speed > 0.2 then
+ if total_speed > 0.1 then
anim = "walk"
- if total_speed > self.speed then
+ if control.aux1 then
anim = "run"
end
if not self.touching_ground
diff --git a/api/lasso.lua b/api/lasso.lua
index c965656..a69dd3f 100644
--- a/api/lasso.lua
+++ b/api/lasso.lua
@@ -323,6 +323,7 @@ minetest.register_craftitem("animalia:lasso", {
if pointed_thing.type == "object" then
if pointed_thing.ref:is_player() then return end
local ent = pointed_thing.ref:get_luaentity()
+ if not ent.catch_with_lasso then return end
if not ent.caught_with_lasso
and not is_lasso_in_use(placer) then
ent.caught_with_lasso = true
diff --git a/init.lua b/init.lua
index bfabd5e..0606152 100644
--- a/init.lua
+++ b/init.lua
@@ -56,8 +56,8 @@ minetest.register_on_mods_loaded(function()
if not old_punch then
old_punch = function() end
end
- local on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir)
- old_punch(self, puncher, time_from_last_punch, tool_capabilities, dir)
+ local on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+ old_punch(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
local pos = self.object:get_pos()
if not pos then
return
diff --git a/mobs/bat.lua b/mobs/bat.lua
index 47b5916..1392890 100644
--- a/mobs/bat.lua
+++ b/mobs/bat.lua
@@ -96,6 +96,7 @@ creatura.register_mob("animalia:bat", {
},
},
catch_with_net = true,
+ catch_with_lasso = false,
follow = {
"butterflies:butterfly_red",
"butterflies:butterfly_white",
@@ -120,6 +121,7 @@ creatura.register_mob("animalia:bat", {
local pos = self.object:get_pos()
local player = creatura.get_nearby_player(self)
if player
+ and player:get_pos()
and not player:get_player_control().sneak then
local dist = vector.distance(pos, player:get_pos())
self._nearby_player = player
@@ -149,7 +151,8 @@ creatura.register_mob("animalia:bat", {
get_score = function(self)
if not self.home_position then return 0 end
local player = self._nearby_player
- if player then
+ if player
+ and player:get_pos() then
local pos = self.object:get_pos()
local dist = vector.distance(pos, player:get_pos())
if dist < 9 then
diff --git a/mobs/bird.lua b/mobs/bird.lua
index 9eea12e..3da2b8f 100644
--- a/mobs/bird.lua
+++ b/mobs/bird.lua
@@ -2,6 +2,17 @@
-- Song Bird --
---------------
+local follows = {}
+
+minetest.register_on_mods_loaded(function()
+ for name, def in pairs(minetest.registered_items) do
+ if name:match(":seed_")
+ or name:match("_seed") then
+ table.insert(follows, name)
+ end
+ end
+end)
+
local random = math.random
local function clamp(val, min, max)
@@ -45,6 +56,7 @@ creatura.register_mob("animalia:bird", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = false,
sounds = {
cardinal = {
name = "animalia_cardinal",
@@ -87,7 +99,8 @@ creatura.register_mob("animalia:bird", {
return 0.15, {self, 1}
end
local player = creatura.get_nearby_player(self)
- if player then
+ if player
+ and player:get_pos() then
local dist = vector.distance(pos, player:get_pos())
self.is_landed = false
return (16 - dist) * 0.1, {self, 1}
@@ -112,7 +125,7 @@ creatura.register_mob("animalia:bird", {
animalia.initialize_api(self)
animalia.initialize_lasso(self)
self.trust = self:recall("trust") or {}
- self.is_landed = self:recall("is_landed") or true
+ self.is_landed = self:recall("is_landed") or false
self.stamina = self:recall("stamina") or 0.1
self._path = {}
end,
diff --git a/mobs/cat.lua b/mobs/cat.lua
index 21cf017..a264f65 100644
--- a/mobs/cat.lua
+++ b/mobs/cat.lua
@@ -45,6 +45,7 @@ creatura.register_mob("animalia:cat", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_cat_idle",
@@ -93,9 +94,9 @@ creatura.register_mob("animalia:cat", {
end,
utility_stack = {
[1] = {
- utility = "animalia:wander",
+ utility = "animalia:skittish_wander",
get_score = function(self)
- return 0.1, {self, true}
+ return 0.1, {self}
end
},
[2] = {
@@ -117,7 +118,8 @@ creatura.register_mob("animalia:cat", {
utility = "animalia:walk_ahead_of_player",
get_score = function(self)
local player = creatura.get_nearby_player(self)
- if player then
+ if player
+ and player:get_player_name() then
local trust = 0
if not self.trust[player:get_player_name()] then
self.trust[player:get_player_name()] = 0
@@ -136,29 +138,6 @@ creatura.register_mob("animalia:cat", {
end
},
[5] = {
- utility = "animalia:flee_from_player",
- get_score = function(self)
- local player = self._nearby_player
- if player then
- local trust = self.trust[player:get_player_name()] or 0
- if trust < 1 then
- if self.owner
- and minetest.get_player_by_name(self.owner) then
- local pos = self.object:get_pos()
- local owner = minetest.get_player_by_name(self.owner)
- local owner_pos = owner:get_pos()
- if owner ~= player
- and vector.distance(pos, owner_pos) < vector.distance(pos, player:get_pos()) then
- return 0
- end
- end
- return 0.5, {self, player}
- end
- end
- return 0
- end
- },
- [6] = {
utility = "animalia:sit",
get_score = function(self)
if self.order == "sit"
@@ -168,7 +147,7 @@ creatura.register_mob("animalia:cat", {
return 0
end
},
- [7] = {
+ [6] = {
utility = "animalia:follow_player",
get_score = function(self)
if self.order == "follow"
@@ -178,7 +157,8 @@ creatura.register_mob("animalia:cat", {
end
local trust = 0
local player = self._nearby_player
- if player then
+ if player
+ and player:get_player_name() then
if not self.trust[player:get_player_name()] then
self.trust[player:get_player_name()] = 0
self:memorize("trust", self.trust)
@@ -199,7 +179,7 @@ creatura.register_mob("animalia:cat", {
return 0
end
},
- [8] = {
+ [7] = {
utility = "animalia:mammal_breed",
get_score = function(self)
if self.breeding then
diff --git a/mobs/chicken.lua b/mobs/chicken.lua
index 1781ba4..ff08889 100644
--- a/mobs/chicken.lua
+++ b/mobs/chicken.lua
@@ -51,6 +51,7 @@ creatura.register_mob("animalia:chicken", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_chicken_idle",
diff --git a/mobs/cow.lua b/mobs/cow.lua
index 0df247a..2763536 100644
--- a/mobs/cow.lua
+++ b/mobs/cow.lua
@@ -57,6 +57,7 @@ creatura.register_mob("animalia:cow", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_cow_random",
diff --git a/mobs/frog.lua b/mobs/frog.lua
index 6b6f2fa..af6f7b0 100644
--- a/mobs/frog.lua
+++ b/mobs/frog.lua
@@ -42,6 +42,7 @@ creatura.register_mob("animalia:frog", {
-- Misc
makes_footstep_sound = true,
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_frog",
@@ -116,7 +117,8 @@ creatura.register_mob("animalia:frog", {
get_score = function(self)
if self.in_liquid then return 0 end
local player = creatura.get_nearby_player(self)
- if player then
+ if player
+ and player:get_player_name() then
local trust = self.trust[player:get_player_name()] or 0
self._nearby_player = player -- stored to memory to avoid calling get_nearby_player again
return (10 - (vec_dist(self.object:get_pos(), player:get_pos()) + trust)) * 0.1, {self, player}
@@ -132,7 +134,8 @@ creatura.register_mob("animalia:frog", {
local water = minetest.find_nodes_in_area(vector.subtract(pos, 1.5), vector.add(pos, 1.5), {"default:water_source"})
if not water[1] then return 0 end
local player = self._nearby_player
- if player then
+ if player
+ and player:get_player_name() then
local trust = self.trust[player:get_player_name()] or 0
return (10 - (vec_dist(self.object:get_pos(), player:get_pos()) + trust)) * 0.1, {self, player}
end
diff --git a/mobs/horse.lua b/mobs/horse.lua
index 0201813..8c5e67f 100644
--- a/mobs/horse.lua
+++ b/mobs/horse.lua
@@ -83,13 +83,15 @@ creatura.register_mob("animalia:horse", {
},
animations = {
stand = {range = {x = 1, y = 60}, speed = 10, frame_blend = 0.3, loop = true},
- walk = {range = {x = 70, y = 110}, speed = 25, frame_blend = 0.3, loop = true},
- run = {range = {x = 70, y = 110}, speed = 45, frame_blend = 0.3, loop = true},
- rear = {range = {x = 120, y = 150}, speed = 27, frame_blend = 0.2, loop = false},
- rear_constant = {range = {x = 130, y = 140}, speed = 20, frame_blend = 0.3, loop = true}
+ walk = {range = {x = 70, y = 110}, speed = 30, frame_blend = 0.3, loop = true},
+ run = {range = {x = 120, y = 140}, speed = 30, frame_blend = 0.3, loop = true},
+ rear = {range = {x = 150, y = 180}, speed = 27, frame_blend = 0.2, loop = false},
+ rear_constant = {range = {x = 160, y = 170}, speed = 20, frame_blend = 0.3, loop = true},
+ eat = {range = {x = 190, y = 220}, speed = 20, frame_blend = 0.3, loop = false}
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
alter_child_pitch = true,
random = {
@@ -125,8 +127,8 @@ creatura.register_mob("animalia:horse", {
},
head_data = {
bone = "Neck.CTRL",
- offset = {x = 0, y = 2, z = 0},
- pitch_correction = 35,
+ offset = {x = 0, y = 1.2, z = 0.15},
+ pitch_correction = 45,
pivot_h = 1,
pivot_v = 1.5
},
@@ -237,7 +239,7 @@ creatura.register_mob("animalia:horse", {
else
self.breaking_progress = self.breaking_progress - 1
end
- self:initiate_utility("animalia:sporadic_flee", self, puncher, true)
+ self:initiate_utility("animalia:horse_breaking", self)
if self.breaking_progress < -5
or minetest.get_player_by_name(self.breaker):get_player_control().sneak then
animalia.mount(self, minetest.get_player_by_name(self.breaker))
@@ -256,7 +258,6 @@ creatura.register_mob("animalia:horse", {
local minppos = vector.add(prt_pos, 1)
local maxppos = vector.subtract(prt_pos, 1)
animalia.particle_spawner(prt_pos, "creatura_particle_green.png", "float", minppos, maxppos)
- self:clear_behavior()
end
end
end
diff --git a/mobs/pig.lua b/mobs/pig.lua
index a6fa7c3..1a7ad83 100644
--- a/mobs/pig.lua
+++ b/mobs/pig.lua
@@ -67,6 +67,7 @@ creatura.register_mob("animalia:pig", {
consumable_nodes = destroyable_crops,
birth_count = 2,
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_pig_idle",
diff --git a/mobs/reindeer.lua b/mobs/reindeer.lua
index 7926167..fba8714 100644
--- a/mobs/reindeer.lua
+++ b/mobs/reindeer.lua
@@ -27,6 +27,7 @@ creatura.register_mob("animalia:reindeer", {
despawn_after = 1500,
-- Entity Physics
stepheight = 1.1,
+ turn_rate = 4,
-- Visuals
mesh = "animalia_reindeer.b3d",
hitbox = {
@@ -43,6 +44,7 @@ creatura.register_mob("animalia:reindeer", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
drops = {
{name = "animalia:venison_raw", min = 1, max = 3, chance = 1},
{name = "animalia:leather", min = 1, max = 3, chance = 2}
diff --git a/mobs/sheep.lua b/mobs/sheep.lua
index 7aa964f..1a8c941 100644
--- a/mobs/sheep.lua
+++ b/mobs/sheep.lua
@@ -71,6 +71,7 @@ creatura.register_mob("animalia:sheep", {
use_texture_alpha = true,
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_sheep_idle",
diff --git a/mobs/tropical_fish.lua b/mobs/tropical_fish.lua
index 0c6e91d..e5a9a31 100644
--- a/mobs/tropical_fish.lua
+++ b/mobs/tropical_fish.lua
@@ -34,6 +34,7 @@ creatura.register_mob("animalia:tropical_fish", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = false,
makes_footstep_sound = false,
-- Function
utility_stack = {
diff --git a/mobs/turkey.lua b/mobs/turkey.lua
index 310f60f..2bb162d 100644
--- a/mobs/turkey.lua
+++ b/mobs/turkey.lua
@@ -42,6 +42,7 @@ creatura.register_mob("animalia:turkey", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
sounds = {
random = {
name = "animalia_turkey_idle",
diff --git a/mobs/wolf.lua b/mobs/wolf.lua
index 85c4ffb..7a573ec 100644
--- a/mobs/wolf.lua
+++ b/mobs/wolf.lua
@@ -36,7 +36,7 @@ creatura.register_mob("animalia:wolf", {
armor_groups = {fleshy = 100},
damage = 4,
speed = 5,
- tracking_range = 32,
+ tracking_range = 24,
despawn_after = 2000,
-- Entity Physics
stepheight = 1.1,
@@ -57,6 +57,7 @@ creatura.register_mob("animalia:wolf", {
},
-- Misc
catch_with_net = true,
+ catch_with_lasso = true,
assist_owner = true,
follow = follow,
head_data = {
@@ -68,7 +69,7 @@ creatura.register_mob("animalia:wolf", {
-- Function
utility_stack = {
[1] = {
- utility = "animalia:wander",
+ utility = "animalia:skittish_boid_wander",
get_score = function(self)
return 0.1, {self, true}
end
@@ -88,7 +89,8 @@ creatura.register_mob("animalia:wolf", {
local target = creatura.get_nearby_entity(self, "animalia:sheep")
local player = self._nearby_player
local is_attacking = self:get_utility() == "animalia:attack"
- if player then
+ if player
+ and player:get_player_name() then
if is_value_in_table(self.enemies, player:get_player_name()) then
local nearby_players = creatura.get_nearby_players(self)
local nearby_allies = creatura.get_nearby_entities(self, self.name)
@@ -111,7 +113,8 @@ creatura.register_mob("animalia:wolf", {
utility = "animalia:flee_from_player",
get_score = function(self)
local player = self._nearby_player
- if player then
+ if player
+ and player:get_player_name() then
if is_value_in_table(self.enemies, player:get_player_name()) then
local nearby_players = creatura.get_nearby_players(self)
local nearby_allies = creatura.get_nearby_entities(self, self.name)
diff --git a/models/animala_horse.b3d b/models/animala_horse.b3d
new file mode 100644
index 0000000..a3992ba
Binary files /dev/null and b/models/animala_horse.b3d differ
diff --git a/models/animalia_horse.b3d b/models/animalia_horse.b3d
index 9be7909..8863724 100644
Binary files a/models/animalia_horse.b3d and b/models/animalia_horse.b3d differ
diff --git a/textures/horse/animalia_horse_1.png b/textures/horse/animalia_horse_1.png
index 79bec9d..1d959cd 100644
Binary files a/textures/horse/animalia_horse_1.png and b/textures/horse/animalia_horse_1.png differ
diff --git a/textures/animalia_guano_bucket.png b/textures/items/animalia_guano_bucket.png
similarity index 57%
rename from textures/animalia_guano_bucket.png
rename to textures/items/animalia_guano_bucket.png
index 9ae87ee..16b3545 100644
Binary files a/textures/animalia_guano_bucket.png and b/textures/items/animalia_guano_bucket.png differ
diff --git a/textures/items/animalia_milk_bucket.png b/textures/items/animalia_milk_bucket.png
index a579df4..a985d6e 100644
Binary files a/textures/items/animalia_milk_bucket.png and b/textures/items/animalia_milk_bucket.png differ
diff --git a/textures/pig/animalia_pig_3.png b/textures/pig/animalia_pig_3.png
index 8d533db..591dab8 100644
Binary files a/textures/pig/animalia_pig_3.png and b/textures/pig/animalia_pig_3.png differ