diff --git a/LICENSE.txt b/LICENSE.txt
index 4362b49..f288702 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,502 +1,674 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 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.
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
+ 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 of use,
-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 this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
+ 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 make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
+ 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 the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
+ 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.
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
+ 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.
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
+ 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.
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
+ 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.
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
+ 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. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+modification follow.
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
+ TERMS AND CONDITIONS
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
+ 0. Definitions.
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
+ "This License" refers to version 3 of the GNU General Public License.
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
+ "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.
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
+ 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.
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- a) The modified work must itself be a software library.
+ 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.
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
+ 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.
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
+ 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.
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
+ 1. Source Code.
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
+ 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.
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+ 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.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
+ 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.
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+ 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.
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
+ The Corresponding Source for a work in source code form is that
+same work.
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
+ 2. Basic Permissions.
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
+ 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.
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
+ 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.
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
+ 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.
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
+ 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.
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
+ 4. Conveying Verbatim Copies.
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
+ 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.
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
+ 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.
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
+ 5. Conveying Modified Source Versions.
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
+ 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:
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
+ 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".
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
+ 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.
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
+ 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.
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
+ 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.
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
+ 6. Conveying Non-Source Forms.
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+ 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:
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
+ 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.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+
+ 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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+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.
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
+ 13. Use with the GNU Affero General Public License.
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+ 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.
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+ 14. Revised Versions of this License.
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body 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.
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser 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.
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
+ 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.
- NO WARRANTY
+ 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. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "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
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ 15. Disclaimer of Warranty.
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY 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
-LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+ 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 Libraries
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
+ How to Apply These Terms to Your New Programs
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
+ 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 library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ 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 library is distributed in the hope that it will be useful,
+ 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
- Lesser General Public License for more details.
+ 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 Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 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.
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+ 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.
- , 1 April 1990
- Ty Coon, President of Vice
+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".
-That's all there is to it!
+ 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/README.md b/README.md
index 05d3075..6cd61cc 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Techage, go through 4 tech ages in search of wealth and power.
### License
Copyright (C) 2019 Joachim Stolberg
-Code: Licensed under the GNU LGPL version 2.1 or later. See LICENSE.txt
+Code: Licensed under the GNU GPL version 3 or later. See LICENSE.txt
Textures: CC BY-SA 3.0
diff --git a/basic_machines/source.lua b/basic_machines/source.lua
index d6d9d80..d8e9156 100644
--- a/basic_machines/source.lua
+++ b/basic_machines/source.lua
@@ -22,6 +22,7 @@ local TA3_Power = techage.SteamPipe
local TA4_Power = techage.ElectricCable
local provide_power = techage.power.provide_power
local power_switched = techage.power.power_switched
+local power_distribution = techage.power.power_distribution
local STANDBY_TICKS = 4
local COUNTDOWN_TICKS = 4
@@ -80,15 +81,28 @@ local State4 = techage.NodeStates:new({
stop_node = stop_node,
})
-local function node_timer(pos, elapsed)
+local function on_power(pos)
local mem = tubelib2.get_mem(pos)
if mem.generating then
mem.provided = provide_power(pos, PWR_CAPA)
- return true
else
mem.provided = 0
end
- return false
+ mem.trigger = 2
+end
+
+local function node_timer(pos, elapsed)
+ local mem = tubelib2.get_mem(pos)
+ if mem.generating then
+ power_distribution(pos)
+ mem.trigger = (mem.trigger or 1) - 1
+ if mem.trigger <= 0 then
+ -- power distribution timeout
+ --print("source not triggered")
+ power_switched(pos)
+ end
+ end
+ return mem.generating
end
local tStates = {0, State2, State3, State4}
@@ -202,14 +216,17 @@ minetest.register_node("techage:t4_source", {
techage.power.register_node({"techage:t2_source"}, {
conn_sides = {"R"},
power_network = TA2_Power,
+ on_power = on_power,
})
techage.power.register_node({"techage:t3_source"}, {
conn_sides = {"R"},
power_network = TA3_Power,
+ on_power = on_power,
})
techage.power.register_node({"techage:t4_source"}, {
conn_sides = {"R"},
power_network = TA4_Power,
+ on_power = on_power,
})
diff --git a/basis/consumer.lua b/basis/consumer.lua
index b47a628..ea36464 100644
--- a/basis/consumer.lua
+++ b/basis/consumer.lua
@@ -26,7 +26,7 @@ local M = minetest.get_meta
local CRD = function(pos) return (minetest.registered_nodes[minetest.get_node(pos).name] or {}).consumer end
local CRDN = function(node) return (minetest.registered_nodes[node.name] or {}).consumer end
-local CYCLE_TIME = 2 -- required from power
+--local CYCLE_TIME = 2 -- required from power
local consume_power = techage.power.consume_power
local power_available = techage.power.power_available
@@ -43,31 +43,39 @@ end
local function stop_node(pos, mem, state)
end
+local function on_power(pos)
+ local crd = CRD(pos)
+ local mem = tubelib2.get_mem(pos)
+ local state = mem.techage_state
+ mem.node_loaded = (mem.node_loaded or 1) - 1
+ if mem.node_loaded >= 0 then
+ if techage.needs_power(mem)then
+ local got = consume_power(pos, crd.power_consumption)
+ if got < crd.power_consumption then
+ crd.State:nopower(pos, mem)
+ end
+ elseif state == techage.STANDBY and not power_available(pos) then
+ crd.State:nopower(pos, mem)
+ elseif state == techage.NOPOWER and power_available(pos) then
+ crd.State:start(pos, mem)
+ end
+ mem.power_available = true
+ end
+end
+
local function node_timer(pos, elapsed)
local crd = CRD(pos)
local mem = tubelib2.get_mem(pos)
local state = mem.techage_state
- if techage.needs_power(mem) then
- local got = consume_power(pos, crd.power_consumption)
- if got < crd.power_consumption then
- crd.State:nopower(pos, mem)
- end
- elseif state == techage.STANDBY then
- if crd.power_consumption > 0 and not power_available(pos) then
- crd.State:nopower(pos, mem)
- end
- elseif state == techage.NOPOWER and power_available(pos) then
- crd.State.start_from_timer(crd.State, pos, mem)
+ if crd.power_consumption > 0 and not mem.power_available then
+ crd.State:nopower(pos, mem)
end
- -- call the secondary timer routine with the requested frequency
+ mem.power_available = false
+ -- node cycle time / power cycle time + security surcharge
+ mem.node_loaded = crd.cycle_time/2 + 1
+ -- call the node timer routine
if techage.is_operational(mem) then
- mem.conn_next_call = mem.conn_next_call or 0
- mem.conn_cycle_timer = (mem.conn_cycle_timer or 0) + CYCLE_TIME
- --print(mem.conn_next_call, mem.conn_cycle_timer)
- if mem.conn_cycle_timer >= mem.conn_next_call then
- crd.node_timer(pos, crd.cycle_time)
- mem.conn_next_call = mem.conn_next_call + crd.cycle_time
- end
+ crd.node_timer(pos, crd.cycle_time)
end
return crd.State:is_active(mem)
end
@@ -124,7 +132,7 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
node_name_passive = name_pas,
node_name_active = name_act,
infotext_name = name_inv,
- cycle_time = CYCLE_TIME,
+ cycle_time = tNode.cycle_time,
standby_ticks = tNode.standby_ticks,
formspec_func = tNode.formspec,
on_state_change = tNode.on_state_change,
@@ -230,6 +238,7 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
techage.power.register_node({name_pas, name_act}, {
conn_sides = {"F", "B"},
power_network = power_network,
+ on_power = on_power,
})
end
techage.register_node({name_pas, name_act}, tNode.tubing)
diff --git a/basis/node_states.lua b/basis/node_states.lua
index cb37239..e79d4dd 100644
--- a/basis/node_states.lua
+++ b/basis/node_states.lua
@@ -200,7 +200,7 @@ function NodeStates:stop(pos, mem)
return true
end
-function NodeStates:start(pos, mem, called_from_on_timer)
+function NodeStates:start(pos, mem)
local state = mem.techage_state or STOPPED
if state ~= RUNNING and state ~= FAULT then
if not self.can_start(pos, mem, state) then
@@ -212,10 +212,6 @@ function NodeStates:start(pos, mem, called_from_on_timer)
self.start_node(pos, mem, state)
end
mem.techage_countdown = 1
- if called_from_on_timer then
- -- timer has to be stopped once to be able to be restarted
- self.stop_timer = true
- end
if self.node_name_active then
swap_node(pos, self.node_name_active)
end
@@ -239,16 +235,17 @@ function NodeStates:start(pos, mem, called_from_on_timer)
end
-- to be used from node timer functions
-function NodeStates:start_from_timer(pos, mem, called_from_on_timer)
- minetest.after(0.1, self.start, self, pos, mem)
+function NodeStates:start_from_timer(pos, mem)
+ local state = mem.techage_state or STOPPED
+ if state ~= RUNNING and state ~= FAULT then
+ minetest.after(0.1, self.start, self, pos, mem)
+ end
end
function NodeStates:standby(pos, mem)
local state = mem.techage_state or STOPPED
if state == RUNNING then
mem.techage_state = STANDBY
- -- timer has to be stopped once to be able to be restarted
- self.stop_timer = true
if self.node_name_passive then
swap_node(pos, self.node_name_passive)
end
@@ -276,8 +273,6 @@ function NodeStates:blocked(pos, mem)
local state = mem.techage_state or STOPPED
if state == RUNNING then
mem.techage_state = BLOCKED
- -- timer has to be stopped once to be able to be restarted
- self.stop_timer = true
if self.node_name_passive then
swap_node(pos, self.node_name_passive)
end
@@ -304,8 +299,6 @@ function NodeStates:nopower(pos, mem)
local state = mem.techage_state or RUNNING
if state ~= STOPPED then
mem.techage_state = NOPOWER
- -- timer has to be stopped once to be able to be restarted
- self.stop_timer = true
if self.node_name_passive then
swap_node(pos, self.node_name_passive)
end
@@ -359,10 +352,6 @@ end
-- keep the timer running?
function NodeStates:is_active(mem)
local state = mem.techage_state or STOPPED
- if self.stop_timer == true then
- self.stop_timer = false
- return false
- end
return state < FAULT
end
@@ -387,7 +376,7 @@ end
-- and keep the node in state RUNNING
function NodeStates:keep_running(pos, mem, val, num_items)
-- set to RUNNING if not already done
- self:start(pos, mem, true)
+ self:start_from_timer(pos, mem)
mem.techage_countdown = val or 4
mem.techage_item_meter = (mem.techage_item_meter or 0) + (num_items or 1)
end
diff --git a/coal_power_station/akkubox.lua b/coal_power_station/akkubox.lua
index dc548e3..0465419 100644
--- a/coal_power_station/akkubox.lua
+++ b/coal_power_station/akkubox.lua
@@ -23,6 +23,7 @@ local PWR_CAPA = 3000
local Power = techage.ElectricCable
local secondary_power = techage.power.secondary_power
local power_switched = techage.power.power_switched
+local power_distribution = techage.power.power_distribution
local function in_range(val, min, max)
if val < min then return min end
@@ -65,7 +66,7 @@ local State = techage.NodeStates:new({
stop_node = stop_node,
})
-local function node_timer(pos, elapsed)
+local function on_power(pos)
local mem = tubelib2.get_mem(pos)
mem.capa = mem.capa or 0
if mem.generating then
@@ -79,12 +80,27 @@ local function node_timer(pos, elapsed)
end
mem.capa = mem.capa - mem.delivered
mem.capa = in_range(mem.capa, 0, PWR_CAPA)
+ mem.trigger = 2
return true
end
mem.delivered = 0
return false
end
+local function node_timer(pos, elapsed)
+ local mem = tubelib2.get_mem(pos)
+ if mem.generating then
+ power_distribution(pos)
+ mem.trigger = (mem.trigger or 1) - 1
+ if mem.trigger <= 0 then
+ power_switched(pos)
+ end
+ return true
+ else
+ mem.provided = 0
+ end
+ return false
+end
local function on_receive_fields(pos, formname, fields, player)
if minetest.is_protected(pos, player:get_player_name()) then
@@ -168,6 +184,7 @@ minetest.register_node("techage:ta3_akku", {
techage.power.register_node({"techage:ta3_akku"}, {
conn_sides = {"R"},
power_network = Power,
+ on_power = on_power,
})
techage.register_entry_page("ta3ps", "akku",
diff --git a/coal_power_station/firebox.lua b/coal_power_station/firebox.lua
index 4d9c0e1..11da9d5 100644
--- a/coal_power_station/firebox.lua
+++ b/coal_power_station/firebox.lua
@@ -52,7 +52,7 @@ local function node_timer(pos, elapsed)
if mem.burn_cycles <= 0 then
local taken = firebox.get_fuel(pos)
if taken then
- mem.burn_cycles = firebox.Burntime[taken:get_name()] / CYCLE_TIME * BURN_CYCLE_FACTOR
+ mem.burn_cycles = (firebox.Burntime[taken:get_name()] or 1) / CYCLE_TIME * BURN_CYCLE_FACTOR
mem.burn_cycles_total = mem.burn_cycles
else
mem.running = false
diff --git a/coal_power_station/generator.lua b/coal_power_station/generator.lua
index 2df9aaa..9551855 100644
--- a/coal_power_station/generator.lua
+++ b/coal_power_station/generator.lua
@@ -24,6 +24,7 @@ local PWR_CAPA = 80
local Cable = techage.ElectricCable
local provide_power = techage.power.provide_power
local power_switched = techage.power.power_switched
+local power_distribution = techage.power.power_distribution
local function formspec(self, pos, mem)
return "size[8,7]"..
@@ -66,22 +67,33 @@ local State = techage.NodeStates:new({
stop_node = stop_node,
})
-local function node_timer(pos, elapsed)
+local function on_power(pos)
local mem = tubelib2.get_mem(pos)
- --print("generator", mem.triggered, mem.generating, PWR_CAPA * (mem.power_level or 0))
- mem.triggered = mem.triggered or 0
- if mem.triggered > 0 and mem.generating then
- mem.provided = provide_power(pos, PWR_CAPA * (mem.power_level or 0))
- mem.triggered = mem.triggered - 1
- State:keep_running(pos, mem, COUNTDOWN_TICKS)
- elseif mem.generating then -- trigger missing
- State:stop(pos, mem)
- mem.generating = 0
- mem.provided = 0
+ if mem.generating then
+ mem.provided = provide_power(pos, PWR_CAPA)
else
mem.provided = 0
end
- return State:is_active(mem)
+ mem.power_available = 2
+end
+
+local function node_timer(pos, elapsed)
+ local mem = tubelib2.get_mem(pos)
+ if mem.generating then
+ power_distribution(pos)
+ State:keep_running(pos, mem, COUNTDOWN_TICKS)
+ mem.power_available = (mem.power_available or 1) - 1
+ mem.triggered = (mem.triggered or 1) - 1
+ if mem.power_available <= 0 or mem.triggered <= 0 then
+ power_switched(pos)
+ State:stop(pos, mem)
+ mem.generating = 0
+ mem.provided = 0
+ end
+ else
+ mem.provided = 0
+ end
+ return mem.generating
end
local function on_receive_fields(pos, formname, fields, player)
@@ -191,6 +203,7 @@ minetest.register_craft({
techage.power.register_node({"techage:generator", "techage:generator_on"}, {
conn_sides = {"R"},
power_network = Cable,
+ on_power = on_power,
})
-- for logical communication
diff --git a/furnace/booster.lua b/furnace/booster.lua
index 98006af..3bf2eea 100644
--- a/furnace/booster.lua
+++ b/furnace/booster.lua
@@ -36,23 +36,47 @@ local function swap_node(pos, name)
minetest.swap_node(pos, node)
end
-local function node_timer(pos, elapsed)
+local function on_power(pos)
local mem = tubelib2.get_mem(pos)
- if mem.running then
+ mem.timer_running = (mem.timer_running or 1) - 1
+ if mem.timer_running >= 0 then
local got = consume_power(pos, PWR_NEEDED)
if got < PWR_NEEDED then
swap_node(pos, "techage:ta3_booster")
+ infotext(pos, "no power")
+ mem.running = false
else
swap_node(pos, "techage:ta3_booster_on")
+ infotext(pos, "running")
+ mem.power_available = 2
minetest.sound_play("techage_booster", {
pos = pos,
gain = 1,
max_hear_distance = 7})
end
- return true
+ else
+ swap_node(pos, "techage:ta3_booster")
+ infotext(pos, "stopped")
+ mem.running = false
+ end
+end
+
+local function node_timer(pos, elapsed)
+ local mem = tubelib2.get_mem(pos)
+ mem.power_available = (mem.power_available or 1) - 1
+ if mem.running and mem.power_available < 0 then
+ swap_node(pos, "techage:ta3_booster")
+ mem.running = false
+ return false
+ end
+ mem.timer_running = CYCLE_TIME/2 + 1
+ return true
+end
+
+local function on_rightclick(pos, node, clicker)
+ if mem.running then
+ minetest.get_node_timer(pos):start(CYCLE_TIME)
end
- swap_node(pos, "techage:ta3_booster")
- return false
end
minetest.register_node("techage:ta3_booster", {
@@ -125,6 +149,7 @@ minetest.register_node("techage:ta3_booster_on", {
techage.power.register_node({"techage:ta3_booster", "techage:ta3_booster_on"}, {
power_network = Power,
conn_sides = {"F", "B", "U", "D", "L"},
+ on_power = on_power,
})
-- for intra machine communication
@@ -135,7 +160,7 @@ techage.register_node({"techage:ta3_booster", "techage:ta3_booster_on"}, {
if topic == "power" then
return mem.running
elseif topic == "start" then
- if power_available(pos, PWR_NEEDED) then
+ if power_available(pos, 0) then
mem.running = true
node_timer(pos, 2)
infotext(pos, "running")
@@ -147,7 +172,7 @@ techage.register_node({"techage:ta3_booster", "techage:ta3_booster_on"}, {
mem.running = false
swap_node(pos, "techage:ta3_booster")
minetest.get_node_timer(pos):stop()
- if mem.has_power then
+ if mem.power_available then
infotext(pos, "stopped")
else
infotext(pos, "no power")
diff --git a/furnace/firebox.lua b/furnace/firebox.lua
index 97a9f28..29c2fb1 100644
--- a/furnace/firebox.lua
+++ b/furnace/firebox.lua
@@ -38,7 +38,7 @@ local function node_timer(pos, elapsed)
if mem.burn_cycles <= 0 then
local taken = firebox.get_fuel(pos)
if taken then
- mem.burn_cycles = firebox.Burntime[taken:get_name()] / CYCLE_TIME
+ mem.burn_cycles = (firebox.Burntime[taken:get_name()] or 1) / CYCLE_TIME
mem.burn_cycles_total = mem.burn_cycles
else
stop_firebox(pos, mem)
diff --git a/init.lua b/init.lua
index 9bdeff9..62ff9db 100644
--- a/init.lua
+++ b/init.lua
@@ -137,8 +137,8 @@ else
-- Test
dofile(MP.."/recipe_checker.lua")
- --dofile(MP.."/.test/sink.lua")
- --dofile(MP.."/.test/source.lua")
- --dofile(MP.."/.test/akku.lua")
+ dofile(MP.."/.test/sink.lua")
+ dofile(MP.."/.test/source.lua")
+ dofile(MP.."/.test/akku.lua")
--dofile(MP.."/.test/switch.lua")
end
\ No newline at end of file
diff --git a/iron_age/hammer.lua b/iron_age/hammer.lua
index 80f3aa7..7e2869f 100644
--- a/iron_age/hammer.lua
+++ b/iron_age/hammer.lua
@@ -26,9 +26,7 @@ local function handler(player_name, node, itemstack, digparams)
if minetest.get_item_group(node.name, "stone") > 0 then
-- Remove item from players inventory or from the world
local ndef = minetest.registered_nodes[node.name]
- print(1)
if ndef then
- print(2)
local item = ItemStack(ndef.drop or node.name)
local inv = minetest.get_inventory({type="player", name=player_name})
if inv:room_for_item("main", item) then
diff --git a/lamps/lib.lua b/lamps/lib.lua
index 1e2046a..f9315db 100644
--- a/lamps/lib.lua
+++ b/lamps/lib.lua
@@ -22,7 +22,8 @@ end
local function on_power(pos)
local mem = tubelib2.get_mem(pos)
- if mem.turned_on then
+ mem.node_loaded = (mem.node_loaded or 1) - 1
+ if mem.turned_on and mem.node_loaded >= 0 then
local got = consume_power(pos, PWR_NEEDED)
if got < PWR_NEEDED and mem.node_on then
swap_node(pos, "off")
@@ -31,17 +32,18 @@ local function on_power(pos)
swap_node(pos, "on")
mem.node_on = true
end
- mem.trigger = true
+ mem.power_available = true
end
end
local function node_timer(pos, elapsed)
local mem = tubelib2.get_mem(pos)
- if mem.node_on and not mem.trigger then
+ if mem.node_on and not mem.power_available then
mem.node_on = false
swap_node(pos, "off")
end
- mem.trigger = false
+ mem.power_available = false
+ mem.node_loaded = CYCLE_TIME/2 + 1
return mem.turned_on
end
diff --git a/oil/drillbox.lua b/oil/drillbox.lua
index edcabb7..31b1fba 100644
--- a/oil/drillbox.lua
+++ b/oil/drillbox.lua
@@ -136,6 +136,11 @@ local function drilling(pos, crd, mem, inv)
elseif node.name == "techage:oil_drillbit2" then
mem.drill_pos.y = mem.drill_pos.y-1
crd.State:keep_running(pos, mem, COUNTDOWN_TICKS)
+ elseif minetest.get_item_group(node.name, "lava") >= 1 then
+ minetest.swap_node(mem.drill_pos, {name = "techage:oil_drillbit2"})
+ inv:remove_item("src", ItemStack("techage:oil_drillbit"))
+ mem.drill_pos.y = mem.drill_pos.y-1
+ crd.State:keep_running(pos, mem, COUNTDOWN_TICKS)
elseif techage.can_node_dig(node, ndef) then
local drop_name = techage.dropped_node(node, ndef)
if drop_name then
diff --git a/oil/generator.lua b/oil/generator.lua
index aeede8f..abc9634 100644
--- a/oil/generator.lua
+++ b/oil/generator.lua
@@ -17,9 +17,10 @@ local M = minetest.get_meta
local S = techage.S
local Power = techage.ElectricCable
+local firebox = techage.firebox
local provide_power = techage.power.provide_power
local power_switched = techage.power.power_switched
-local firebox = techage.firebox
+local power_distribution = techage.power.power_distribution
local CYCLE_TIME = 2
local PWR_CAPA = 12
@@ -84,7 +85,8 @@ local function burning(pos, mem)
if mem.burn_cycles <= 0 then
local taken = firebox.get_fuel(pos)
if taken then
- mem.burn_cycles = firebox.Burntime[taken:get_name()] / CYCLE_TIME * BURN_CYCLE_FACTOR
+ mem.burn_cycles = (firebox.Burntime[taken:get_name()] or 1) / CYCLE_TIME * BURN_CYCLE_FACTOR
+
mem.burn_cycles_total = mem.burn_cycles
return true
else
@@ -96,15 +98,29 @@ local function burning(pos, mem)
end
end
+local function on_power(pos)
+ local mem = tubelib2.get_mem(pos)
+ if mem.generating then
+ mem.provided = provide_power(pos, PWR_CAPA)
+ else
+ mem.provided = 0
+ end
+ mem.trigger = 2
+end
+
local function node_timer(pos, elapsed)
local mem = tubelib2.get_mem(pos)
if mem.generating and burning(pos, mem) then
- mem.provided = provide_power(pos, PWR_CAPA)
+ power_distribution(pos)
minetest.sound_play("techage_generator", {
pos = pos,
gain = 1,
max_hear_distance = 10})
- State:keep_running(pos, mem, CYCLE_TIME)
+ --State:keep_running(pos, mem, CYCLE_TIME)
+ mem.trigger = (mem.trigger or 1) - 1
+ if mem.trigger <= 0 then
+ power_switched(pos)
+ end
return true
else
mem.provided = 0
@@ -223,6 +239,7 @@ minetest.register_node("techage:tiny_generator_on", {
techage.power.register_node({"techage:tiny_generator", "techage:tiny_generator_on"}, {
conn_sides = {"R"},
power_network = Power,
+ on_power = on_power,
})
techage.register_node({"techage:tiny_generator", "techage:tiny_generator_on"}, {
diff --git a/power/power.lua b/power/power.lua
index 16dc203..6733847 100644
--- a/power/power.lua
+++ b/power/power.lua
@@ -100,6 +100,34 @@ local function matching_nodes(pos, peer_pos)
return not tube_type1 or not tube_type2 or tube_type1 == tube_type2
end
+local function min(val, max)
+ if val < 0 then return 0 end
+ if val > max then return max end
+ return val
+end
+
+-- called from master every cycle (2 seconds)
+local function accounting(mem)
+ -- defensive programming
+ mem.needed1 = mem.needed1 or 0
+ mem.needed2 = mem.needed2 or 0
+ mem.available1 = mem.available1 or 0
+ mem.available2 = mem.available2 or 0
+ -- calculate the primary and secondary supply and demand
+ mem.supply1 = min(mem.needed1 + mem.needed2, mem.available1)
+ mem.demand1 = min(mem.needed1, mem.available1 + mem.available2)
+ mem.supply2 = min(mem.demand1 - mem.supply1, mem.available2)
+ mem.demand2 = min(mem.supply1 - mem.demand1, mem.available1)
+ mem.reserve = (mem.available1 + mem.available2) > mem.needed1
+ --print("needed = "..mem.needed1.."/"..mem.needed2..", available = "..mem.available1.."/"..mem.available2)
+ --print("supply = "..mem.supply1.."/"..mem.supply2..", demand = "..mem.demand1.."/"..mem.demand2..", reserve = "..dump(mem.reserve))
+ -- reset values for nect cycle
+ mem.needed1 = 0
+ mem.needed2 = 0
+ mem.available1 = 0
+ mem.available2 = 0
+end
+
local function connection_walk(pos, clbk)
local mem = tubelib2.get_mem(pos)
mem.interrupted_dirs = mem.interrupted_dirs or {}
@@ -122,7 +150,8 @@ local function determine_master(pos)
local hash = 0
local master = nil
connection_walk(pos, function(pos, mem)
- if mem.generating then
+ if mem.generating and mem.could_be_master then
+ mem.could_be_master = false
local new = minetest.hash_node_position(pos)
if hash <= new then
hash = new
@@ -143,7 +172,7 @@ local function store_master(pos, master_pos)
end)
end
-local function trigger_lamps(pos)
+local function trigger_nodes(pos)
Route = {}
pos_already_reached(pos)
connection_walk(pos, function(pos, mem)
@@ -154,50 +183,30 @@ local function trigger_lamps(pos)
end)
end
--- called from any generator
+-- Called from any generator on any power switching process
+-- and to determine a new master in case of a timeout
local function on_power_switch(pos)
--print("on_power_change"..S(pos))
+ --local t = minetest.get_us_time()
local mem = tubelib2.get_mem(pos)
mem.master_pos = nil
mem.is_master = nil
local mpos = determine_master(pos)
store_master(pos, mpos)
+ --print("store_master", S(pos), S(mpos))
if mpos then
local mem = tubelib2.get_mem(mpos)
mem.is_master = true
+ -- trigger all nodes so that we get a stable state again
+ trigger_nodes(mpos)
+ accounting(tubelib2.get_mem(mpos))
+ --t = minetest.get_us_time() - t
+ --print("t = "..t)
return mem
end
end
-local function min(val, max)
- if val < 0 then return 0 end
- if val > max then return max end
- return val
-end
-
--- called from master every 2 seconds
-local function accounting(mem)
- -- defensive programming
- mem.needed1 = mem.needed1 or 0
- mem.needed2 = mem.needed2 or 0
- mem.available1 = mem.available1 or 0
- mem.available2 = mem.available2 or 0
- -- calculate the primary and secondary supply and demand
- mem.supply1 = min(mem.needed1 + mem.needed2, mem.available1)
- mem.demand1 = min(mem.needed1, mem.available1 + mem.available2)
- mem.supply2 = min(mem.demand1 - mem.supply1, mem.available2)
- mem.demand2 = min(mem.supply1 - mem.demand1, mem.available1)
- mem.reserve = (mem.available1 + mem.available2) > mem.needed1
- --print("needed = "..mem.needed1.."/"..mem.needed2..", available = "..mem.available1.."/"..mem.available2)
- --print("supply = "..mem.supply1.."/"..mem.supply2..", demand = "..mem.demand1.."/"..mem.demand2..", reserve = "..dump(mem.reserve))
- -- reset values for nect cycle
- mem.needed1 = 0
- mem.needed2 = 0
- mem.available1 = 0
- mem.available2 = 0
-end
-
--
-- Generic API functions
--
@@ -223,7 +232,7 @@ function techage.power.power_cut(pos, dir, cable, cut)
for dir,_ in pairs(mem.connections) do
mem.interrupted_dirs[dir] = false
on_power_switch(npos)
- trigger_lamps(npos)
+ trigger_nodes(npos)
mem.interrupted_dirs[dir] = true
end
else
@@ -311,8 +320,21 @@ function techage.power.after_tube_update(node, pos, out_dir, peer_pos, peer_in_d
end
end
+-- Called from every generator every 2 seconds
+function techage.power.power_distribution(pos)
+ local mem = tubelib2.get_mem(pos)
+ --print("power_distribution", S(pos), mem.is_master)
+ -- timer is running, which is needed to be master
+ mem.could_be_master = true
+ if mem.is_master then
+ trigger_nodes(pos, mem)
+ accounting(mem)
+ end
+end
+
function techage.power.consume_power(pos, needed)
local master_pos = tubelib2.get_mem(pos).master_pos
+ --print("consume_power", S(master_pos))
if master_pos then
local mem = tubelib2.get_mem(master_pos)
-- for next cycle
@@ -332,19 +354,12 @@ end
function techage.power.provide_power(pos, provide)
local mem = tubelib2.get_mem(pos)
if mem.is_master then
- --nothing todo
+ -- nothing to do
elseif mem.master_pos then
mem = tubelib2.get_mem(mem.master_pos)
else
return 0
end
- if (mem.next_cycle or 0) < minetest.get_us_time() then
- accounting(mem)
- trigger_lamps(pos, mem)
- mem.next_cycle = minetest.get_us_time() + 2000000 -- 2s
- elseif (mem.next_cycle or 0) > minetest.get_us_time() + 2000000 then
- mem.next_cycle = minetest.get_us_time()
- end
-- for next cycle
mem.available1 = (mem.available1 or 0) + provide
-- current cycle
@@ -357,19 +372,12 @@ end
function techage.power.secondary_power(pos, provide, needed)
local mem = tubelib2.get_mem(pos)
if mem.is_master then
- --nothing todo
+ -- nothing to do
elseif mem.master_pos then
mem = tubelib2.get_mem(mem.master_pos)
else
return 0
end
- if (mem.next_cycle or 0) < minetest.get_us_time() then
- accounting(mem)
- trigger_lamps(pos, mem)
- mem.next_cycle = minetest.get_us_time() + 2000000 -- 2s
- elseif (mem.next_cycle or 0) > minetest.get_us_time() + 2000000 then
- mem.next_cycle = minetest.get_us_time()
- end
-- for next cycle
mem.available2 = (mem.available2 or 0) + provide
mem.needed2 = (mem.needed2 or 0) + needed
diff --git a/steam_engine/firebox.lua b/steam_engine/firebox.lua
index 7911b42..5779c98 100644
--- a/steam_engine/firebox.lua
+++ b/steam_engine/firebox.lua
@@ -38,7 +38,7 @@ local function node_timer(pos, elapsed)
if mem.burn_cycles <= 0 then
local taken = firebox.get_fuel(pos)
if taken then
- mem.burn_cycles = firebox.Burntime[taken:get_name()] / CYCLE_TIME * BURN_CYCLE_FACTOR
+ mem.burn_cycles = (firebox.Burntime[taken:get_name()] or 1) / CYCLE_TIME * BURN_CYCLE_FACTOR
mem.burn_cycles_total = mem.burn_cycles
else
mem.running = false
diff --git a/steam_engine/flywheel.lua b/steam_engine/flywheel.lua
index d7d8282..194bd3f 100644
--- a/steam_engine/flywheel.lua
+++ b/steam_engine/flywheel.lua
@@ -25,6 +25,7 @@ local PWR_CAPA = 25
local Axle = techage.Axle
local provide_power = techage.power.provide_power
local power_switched = techage.power.power_switched
+local power_distribution = techage.power.power_distribution
local function formspec(self, pos, mem)
return "size[8,7]"..
@@ -39,7 +40,7 @@ local function formspec(self, pos, mem)
end
local function can_start(pos, mem, state)
- return (mem.triggered or 0) > 0 -- by means of firebox
+ return (mem.firebox_trigger or 0) > 0 -- by means of firebox
end
local function start_node(pos, mem, state)
@@ -76,26 +77,41 @@ local State = techage.NodeStates:new({
stop_node = stop_node,
})
-local function node_timer(pos, elapsed)
+local function on_power(pos)
local mem = tubelib2.get_mem(pos)
- mem.triggered = mem.triggered or 0
- if mem.triggered > 0 and mem.generating then
+ if mem.generating then
mem.provided = provide_power(pos, PWR_CAPA)
- mem.triggered = mem.triggered - 1
- State:keep_running(pos, mem, COUNTDOWN_TICKS)
- mem.handle = minetest.sound_play("techage_steamengine", {
- pos = pos,
- gain = 0.5,
- max_hear_distance = 10})
- elseif mem.generating then -- trigger missing
- State:stop(pos, mem)
- mem.generating = 0
- mem.provided = 0
- techage.transfer(pos, "L", "stop", nil, nil, {
- "techage:cylinder_on"})
else
mem.provided = 0
end
+ mem.master_trigger = 2
+end
+
+local function node_timer(pos, elapsed)
+ local mem = tubelib2.get_mem(pos)
+ if mem.generating then
+ mem.firebox_trigger = (mem.firebox_trigger or 0) - 1
+ mem.master_trigger = (mem.master_trigger or 0) - 1
+
+ if mem.firebox_trigger <= 0 then
+ power_switched(pos)
+ State:nopower(pos, mem)
+ mem.generating = 0
+ mem.provided = 0
+ techage.transfer(pos, "L", "stop", nil, nil, {"techage:cylinder_on"})
+ else
+ power_distribution(pos)
+ State:keep_running(pos, mem, COUNTDOWN_TICKS)
+ mem.handle = minetest.sound_play("techage_steamengine", {
+ pos = pos,
+ gain = 0.5,
+ max_hear_distance = 10})
+
+ if mem.master_trigger <= 0 then
+ power_switched(pos)
+ end
+ end
+ end
return State:is_active(mem)
end
@@ -205,13 +221,14 @@ minetest.register_node("techage:flywheel_on", {
techage.power.register_node({"techage:flywheel", "techage:flywheel_on"}, {
conn_sides = {"R"},
power_network = Axle,
+ on_power = on_power,
})
techage.register_node({"techage:flywheel", "techage:flywheel_on"}, {
on_transfer = function(pos, in_dir, topic, payload)
local mem = tubelib2.get_mem(pos)
if topic == "trigger" then
- mem.triggered = 2
+ mem.firebox_trigger = 3
if mem.generating then
return math.max((mem.provided or PWR_CAPA) / PWR_CAPA, 0.1)
else
diff --git a/steam_engine/gearbox.lua b/steam_engine/gearbox.lua
index 5077921..96abd15 100644
--- a/steam_engine/gearbox.lua
+++ b/steam_engine/gearbox.lua
@@ -18,7 +18,7 @@ local M = minetest.get_meta
local S = techage.S
local PWR_NEEDED = 1
-local CYCLE_TIME = 2
+local CYCLE_TIME = 4
local Axle = techage.Axle
local consume_power = techage.power.consume_power
@@ -32,18 +32,34 @@ local function swap_node(pos, name)
minetest.swap_node(pos, node)
end
+local function on_power(pos)
+ local mem = tubelib2.get_mem(pos)
+ mem.node_loaded = (mem.node_loaded or 1) - 1
+ if mem.node_loaded >= 0 then
+ local got = consume_power(pos, PWR_NEEDED)
+ if got < PWR_NEEDED and mem.node_on then
+ swap_node(pos, "techage:gearbox")
+ techage.switch_axles(pos, false)
+ mem.node_on = false
+ elseif not mem.node_on then
+ swap_node(pos, "techage:gearbox_on")
+ techage.switch_axles(pos, true)
+ mem.node_on = true
+ end
+ mem.power_available = true
+ end
+end
+
+
local function node_timer(pos, elapsed)
local mem = tubelib2.get_mem(pos)
- local got = consume_power(pos, PWR_NEEDED)
- if mem.running and got < PWR_NEEDED then
+ if mem.node_on and not mem.power_available then
swap_node(pos, "techage:gearbox")
techage.switch_axles(pos, false)
- mem.running = false
- elseif not mem.running and got == PWR_NEEDED then
- swap_node(pos, "techage:gearbox_on")
- techage.switch_axles(pos, true)
- mem.running = true
+ mem.node_on = false
end
+ mem.power_available = false
+ mem.node_loaded = CYCLE_TIME/2 + 1
return true
end
@@ -100,6 +116,7 @@ minetest.register_node("techage:gearbox_on", {
techage.power.register_node({"techage:gearbox", "techage:gearbox_on"}, {
power_network = Axle,
+ on_power = on_power,
})
minetest.register_craft({
diff --git a/tools/trowel.lua b/tools/trowel.lua
index cdcc26c..e2f5bf9 100644
--- a/tools/trowel.lua
+++ b/tools/trowel.lua
@@ -37,7 +37,8 @@ local function hide_node(pos, node, meta, placer)
local taken = stack:take_item(1)
local ndef = minetest.registered_nodes[taken:get_name()]
-- test if it is a simple node without logic
- if taken:get_count() == 1
+ if taken:get_count() == 1
+ and ndef
and not ndef.groups.soil
and not ndef.after_place_node
and not ndef.on_construct then
@@ -97,6 +98,8 @@ minetest.register_on_dignode(function(pos, oldnode, digger)
-- test both hidden networks
techage.ElectricCable:after_dig_node(pos, oldnode, digger)
techage.BiogasPipe:after_dig_node(pos, oldnode, digger)
+ -- probably a hidden node with mem data
+ tubelib2.del_mem(pos)
else
-- store pos for other tools without own 'register_on_dignode'
techage.dug_node[digger:get_player_name()] = pos