forked from VoxeLibre/VoxeLibre
Compare commits
1 Commits
| Author | SHA1 | Date |
|---|---|---|
 the-real-herowl
|
9dcc51f0ab |
|
|
@ -4,7 +4,7 @@ root = true
|
|||
end_of_line = lf
|
||||
|
||||
[*.lua]
|
||||
charset = utf-8
|
||||
charset = utf8
|
||||
indent_style = tab
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
|
|||
mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
|
||||
mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
|
||||
|
||||
-- Central chunk is offset from 0,0,0 coordinates by 32 nodes (2 blocks)
|
||||
-- See more in https://git.minetest.land/MineClone2/MineClone2/wiki/World-structure%3A-positions%2C-boundaries%2C-blocks%2C-chunks%2C-dimensions%2C-barriers-and-the-void
|
||||
local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
|
||||
|
||||
mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
|
||||
|
|
|
|||
|
|
@ -1,674 +0,0 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
|
|
@ -1,87 +1,4 @@
|
|||
# tga_encoder
|
||||
A TGA Encoder written in Lua without the use of external Libraries.
|
||||
|
||||
Created by fleckenstein for MineClone2, then improved by erlehmann.
|
||||
|
||||
May be used as a Minetest mod.
|
||||
|
||||
See `examples.lua` for example code and usage hints.
|
||||
|
||||
## Use Cases for `tga_encoder`
|
||||
|
||||
### Encoding Textures for Editing
|
||||
|
||||
TGA images of types 1/2/3 consist of header data followed by a pixel array.
|
||||
|
||||
This makes it trivial to parse TGA files – and even edit pixels in-place.
|
||||
|
||||
No checksums need to be updated on any kind of in-place texture editing.
|
||||
|
||||
**Tip**: When storing an editable image in item meta, use zlib compression.
|
||||
|
||||
### Legacy Minetest Texture Encoding
|
||||
|
||||
Minetest 5.4 did not include `minetest.encode_png()` (or any equvivalent).
|
||||
|
||||
Since `tga_encoder` is written in pure Lua, it does not need engine support.
|
||||
|
||||
**Tip:** Look at `examples.lua` and the Minetest mod `mcl_maps` for guidance.
|
||||
|
||||
### Advanced Texture Format Control
|
||||
|
||||
The function `minetest.encode_png()` always encodes images as 32bpp RGBA.
|
||||
|
||||
`tga_encoder` allows saving images as grayscale, 16bpp RGBA and 24bpp RGB.
|
||||
|
||||
For generating maps from terrain, color-mapped formats can be more useful.
|
||||
|
||||
### Encoding Very Small Textures
|
||||
|
||||
Images of size 8×8 or below are often smaller than an equivalent PNG file.
|
||||
|
||||
Note that on many filesystems files use at least 4096 bytes (i.e. 64×64).
|
||||
|
||||
Therefore, saving bytes on files up to a few 100 bytes is often useless.
|
||||
|
||||
### Encoding Reference Textures
|
||||
|
||||
TGA is a simple format, which makes it easy to create reference textures.
|
||||
|
||||
Using a hex editor, one can trivially see how all the pixels are stored.
|
||||
|
||||
## Supported Image Types
|
||||
|
||||
For all types, images are encoded in a fast single pass (i.e. append-only).
|
||||
|
||||
### Color-Mapped Images (Type 1)
|
||||
|
||||
These images contain a palette, followed by pixel data.
|
||||
|
||||
* `A1R5G5B5` (8bpp RGB)
|
||||
* `B8G8R8` (8bpp RGB)
|
||||
* `B8G8R8A8` (8bpp RGBA)
|
||||
|
||||
### True-Color Images (Type 2)
|
||||
|
||||
These images contain uncompressed RGB(A) pixel data.
|
||||
|
||||
* `A1R5G5B5` (16bpp RGBA)
|
||||
* `B8G8R8` (24bpp RGB)
|
||||
* `B8G8R8A8` (32bpp RGBA)
|
||||
|
||||
### Grayscale Images (Type 3)
|
||||
|
||||
* `Y8` (8bpp grayscale)
|
||||
|
||||
### Run-Length Encoded (RLE), True-Color Images (Type 10)
|
||||
|
||||
These images contain compressed RGB(A) pixel data.
|
||||
|
||||
* `A1R5G5B5` (16bpp RGBA)
|
||||
* `B8G8R8` (24bpp RGB)
|
||||
* `B8G8R8A8` (32bpp RGBA)
|
||||
|
||||
## TODO
|
||||
|
||||
* Actually support `R8G8B8A8` input for `A1R5G5B5` output
|
||||
* Add both zoomable and explorable maps to `mcl_maps`.
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
dofile("init.lua")
|
||||
|
||||
-- This generates images necessary to colorize 16 Minetest nodes in 4096 colors.
|
||||
-- It serves as a demonstration of what you can achieve using colormapped nodes.
|
||||
-- It is be useful for grass or beam or glass nodes that need to blend smoothly.
|
||||
|
||||
-- Sample depth rescaling is done according to the algorithm presented in:
|
||||
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
|
||||
local max_sample_in = math.pow(2, 4) - 1
|
||||
local max_sample_out = math.pow(2, 8) - 1
|
||||
|
||||
for r = 0,15 do
|
||||
local pixels = {}
|
||||
for g = 0,15 do
|
||||
if nil == pixels[g + 1] then
|
||||
pixels[g + 1] = {}
|
||||
end
|
||||
for b = 0,15 do
|
||||
local color = {
|
||||
math.floor((r * max_sample_out / max_sample_in) + 0.5),
|
||||
math.floor((g * max_sample_out / max_sample_in) + 0.5),
|
||||
math.floor((b * max_sample_out / max_sample_in) + 0.5),
|
||||
}
|
||||
pixels[g + 1][b + 1] = color
|
||||
end
|
||||
end
|
||||
local filename = "colormap_" .. tostring(r) .. ".tga"
|
||||
tga_encoder.image(pixels):save(
|
||||
filename,
|
||||
{ color_format="A1R5G5B5" } -- waste less bits
|
||||
)
|
||||
end
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
#!/usr/bin/env lua5.1
|
||||
-- -*- coding: utf-8 -*-
|
||||
|
||||
-- 3D “donut” shape rendering using floating-point math
|
||||
-- see <https://www.a1k0n.net/2011/07/20/donut-math.html>
|
||||
|
||||
-- cargo-culted by erle 2023-09-18
|
||||
|
||||
local theta_spacing = 0.01 -- 0.07
|
||||
local phi_spacing = 0.002 -- 0.02
|
||||
|
||||
local R1 = 1
|
||||
local R2 = 2
|
||||
local K2 = 5
|
||||
|
||||
local screen_height = 256
|
||||
local screen_width = 256
|
||||
|
||||
local K1 = screen_width * K2 * 3 / ( 8 * ( R1 + R2 ) )
|
||||
|
||||
local output = {}
|
||||
local zbuffer = {}
|
||||
|
||||
local grey = { 120, 120, 120 }
|
||||
local gray = { 136, 136, 136 }
|
||||
|
||||
for y = 1,screen_height,1 do
|
||||
output[y] = {}
|
||||
zbuffer[y] = {}
|
||||
for x = 1,screen_width,1 do
|
||||
local hori = math.floor( ( (y - 1) / 32 ) % 2 )
|
||||
local vert = math.floor( ( (x - 1) / 32 ) % 2 )
|
||||
output[y][x] = hori ~= vert and grey or gray
|
||||
zbuffer[y][x] = 0
|
||||
end
|
||||
end
|
||||
|
||||
function render_frame(A, B)
|
||||
-- precompute sines and cosines of A and B
|
||||
local cosA = math.cos(A)
|
||||
local sinA = math.sin(A)
|
||||
local cosB = math.cos(B)
|
||||
local sinB = math.sin(B)
|
||||
|
||||
-- theta goas around the cross-sectional circle of a torus
|
||||
local theta = 0
|
||||
while theta <= 2*math.pi do
|
||||
if ( theta < 2*math.pi * 1/8 ) or ( theta > 2*math.pi * 7/8 ) then
|
||||
theta = theta + (theta_spacing * 16)
|
||||
else
|
||||
theta = theta + theta_spacing
|
||||
end
|
||||
-- precompute sines and cosines of theta
|
||||
local costheta = math.cos(theta)
|
||||
local sintheta = math.sin(theta)
|
||||
|
||||
-- phi goes around the center of revolution of a torus
|
||||
local phi = 0
|
||||
while phi <= 2*math.pi do
|
||||
if ( phi > 2*math.pi * 3/8 ) and ( phi < 2*math.pi * 5/8 ) then
|
||||
phi = phi + (phi_spacing * 128)
|
||||
else
|
||||
phi = phi + phi_spacing
|
||||
end
|
||||
-- precompute sines and cosines of phi
|
||||
local cosphi = math.cos(phi)
|
||||
local sinphi = math.sin(phi)
|
||||
|
||||
-- 2D (x, y) coordinates of the circle, before revolving
|
||||
local circlex = R2 + R1*costheta
|
||||
local circley = R1*sintheta
|
||||
|
||||
-- 3D (x, y, z) coordinates after rotation
|
||||
local x = circlex*(cosB*cosphi + sinA*sinB*sinphi) - circley*cosA*sinB
|
||||
local y = circlex*(sinB*cosphi - sinA*cosB*sinphi) + circley*cosA*cosB
|
||||
local z = K2 + cosA*circlex*sinphi + circley*sinA
|
||||
|
||||
local ooz = 1/z
|
||||
|
||||
-- x and y projection
|
||||
local xp = math.floor(screen_width/2 + K1*ooz*x)
|
||||
local yp = math.floor(screen_height/2 + K1*ooz*y)
|
||||
|
||||
-- calculate luminance
|
||||
local L = cosphi*costheta*sinB - cosA*costheta*sinphi - sinA*sintheta + cosB*( cosA*sintheta - costheta*sinA*sinphi )
|
||||
-- if (L > 0) then
|
||||
if (true) then
|
||||
if (ooz > zbuffer[yp][xp]) then
|
||||
zbuffer[yp][xp] = ooz
|
||||
local luminance = math.max( math.ceil( L * 180 ), 0 )
|
||||
-- luminance is now in the range 0 to 255
|
||||
r = math.ceil( (luminance + xp) / 2 )
|
||||
g = math.ceil( (luminance + yp) / 2 )
|
||||
b = math.ceil( (luminance + xp + yp) / 3 )
|
||||
output[yp][xp] = { r, g, b }
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
dofile('init.lua')
|
||||
|
||||
render_frame(-0.7, 0.7)
|
||||
tga_encoder.image(output):save("donut.tga")
|
||||
|
|
@ -1,181 +0,0 @@
|
|||
dofile("init.lua")
|
||||
|
||||
-- encode a bitmap
|
||||
local _ = { 0, 0, 0 }
|
||||
local R = { 255, 127, 127 }
|
||||
local pixels = {
|
||||
{ _, _, _, _, _, _, _ },
|
||||
{ _, _, _, R, _, _, _ },
|
||||
{ _, _, R, R, R, _, _ },
|
||||
{ _, R, R, R, R, R, _ },
|
||||
{ _, R, R, R, R, R, _ },
|
||||
{ _, _, R, _, R, _, _ },
|
||||
{ _, _, _, _, _, _, _ },
|
||||
}
|
||||
tga_encoder.image(pixels):save("bitmap_small.tga")
|
||||
|
||||
-- test that image can be encoded
|
||||
local bitmap_small_0 = tga_encoder.image(pixels)
|
||||
bitmap_small_0:encode()
|
||||
assert(191 == #bitmap_small_0.data)
|
||||
|
||||
-- test that imbage can be encoded with parameters
|
||||
local bitmap_small_1 = tga_encoder.image(pixels)
|
||||
bitmap_small_1:encode(
|
||||
{
|
||||
colormap = {},
|
||||
color_format = "B8G8R8",
|
||||
compression = "RAW",
|
||||
}
|
||||
)
|
||||
assert(191 == #bitmap_small_1.data)
|
||||
|
||||
-- change a single pixel, then rescale the bitmap
|
||||
local pixels_orig = pixels
|
||||
pixels_orig[4][4] = { 255, 255, 255 }
|
||||
local pixels = {}
|
||||
for x = 1,56,1 do
|
||||
local x_orig = math.ceil(x/8)
|
||||
for z = 1,56,1 do
|
||||
local z_orig = math.ceil(z/8)
|
||||
local color = pixels_orig[z_orig][x_orig]
|
||||
pixels[z] = pixels[z] or {}
|
||||
pixels[z][x] = color
|
||||
end
|
||||
end
|
||||
tga_encoder.image(pixels):save("bitmap_large.tga")
|
||||
|
||||
-- note that the uncompressed grayscale TGA file written in this
|
||||
-- example is 80 bytes – but an optimized PNG file is 81 bytes …
|
||||
local pixels = {}
|
||||
for x = 1,6,1 do -- left to right
|
||||
for z = 1,6,1 do -- bottom to top
|
||||
local color = { math.min(x * z * 4 - 1, 255) }
|
||||
pixels[z] = pixels[z] or {}
|
||||
pixels[z][x] = color
|
||||
end
|
||||
end
|
||||
tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
|
||||
|
||||
local pixels = {}
|
||||
for x = 1,16,1 do -- left to right
|
||||
for z = 1,16,1 do -- bottom to top
|
||||
local r = math.min(x * 32 - 1, 255)
|
||||
local g = math.min(z * 32 - 1, 255)
|
||||
local b = 0
|
||||
-- blue rectangle in top right corner
|
||||
if x > 8 and z > 8 then
|
||||
r = 0
|
||||
g = 0
|
||||
b = math.min(z * 16 - 1, 255)
|
||||
end
|
||||
local color = { r, g, b }
|
||||
pixels[z] = pixels[z] or {}
|
||||
pixels[z][x] = color
|
||||
end
|
||||
end
|
||||
local gradients = tga_encoder.image(pixels)
|
||||
gradients:save("gradients_8bpp_raw.tga", {color_format="Y8", compression="RAW"})
|
||||
gradients:save("gradients_16bpp_raw.tga", {color_format="A1R5G5B5", compression="RAW"})
|
||||
gradients:save("gradients_16bpp_rle.tga", {color_format="A1R5G5B5", compression="RLE"})
|
||||
gradients:save("gradients_24bpp_raw.tga", {color_format="B8G8R8", compression="RAW"})
|
||||
gradients:save("gradients_24bpp_rle.tga", {color_format="B8G8R8", compression="RLE"})
|
||||
|
||||
for x = 1,16,1 do -- left to right
|
||||
for z = 1,16,1 do -- bottom to top
|
||||
local color = pixels[z][x]
|
||||
color[#color+1] = ((x * x) + (z * z)) % 256
|
||||
pixels[z][x] = color
|
||||
end
|
||||
end
|
||||
gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"})
|
||||
-- the RLE-compressed file is larger than just dumping pixels because
|
||||
-- the gradients in this picture can not be compressed well using RLE
|
||||
gradients:save("gradients_32bpp_rle.tga", {color_format="B8G8R8A8", compression="RLE"})
|
||||
|
||||
local pixels = {}
|
||||
for x = 1,512,1 do -- left to right
|
||||
for z = 1,512,1 do -- bottom to top
|
||||
local oz = (z - 256) / 256 + 0.75
|
||||
local ox = (x - 256) / 256
|
||||
local px, pz, i = 0, 0, 0
|
||||
while (px * px) + (pz * pz) <= 4 and i < 128 do
|
||||
px = (px * px) - (pz * pz) + oz
|
||||
pz = (2 * px * pz) + ox
|
||||
i = i + 1
|
||||
end
|
||||
local color = {
|
||||
math.max(0, math.min(255, math.floor(px * 64))),
|
||||
math.max(0, math.min(255, math.floor(pz * 64))),
|
||||
math.max(0, math.min(255, math.floor(i))),
|
||||
}
|
||||
pixels[z] = pixels[z] or {}
|
||||
pixels[z][x] = color
|
||||
end
|
||||
end
|
||||
tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"})
|
||||
tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"})
|
||||
tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"})
|
||||
|
||||
-- encode a colormapped bitmap
|
||||
local K = { 0 }
|
||||
local B = { 1 }
|
||||
local R = { 2 }
|
||||
local G = { 3 }
|
||||
local W = { 4 }
|
||||
local colormap = {
|
||||
{ 1, 2, 3 }, -- K
|
||||
{ 0, 0, 255 }, -- B
|
||||
{ 255, 0, 0 }, -- R
|
||||
{ 0, 255, 0 }, -- G
|
||||
{ 253, 254, 255 }, -- W
|
||||
}
|
||||
local pixels = {
|
||||
{ W, K, W, K, W, K, W },
|
||||
{ R, G, B, R, G, B, K },
|
||||
{ K, W, K, W, K, W, K },
|
||||
{ G, B, R, G, B, R, W },
|
||||
{ W, W, W, K, K, K, W },
|
||||
{ B, R, G, B, R, G, K },
|
||||
{ B, R, G, B, R, G, W },
|
||||
}
|
||||
-- note that the uncompressed colormapped TGA file written in this
|
||||
-- example is 108 bytes – but an optimized PNG file is 121 bytes …
|
||||
tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap})
|
||||
-- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes
|
||||
tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"})
|
||||
|
||||
-- encode a colormapped bitmap with transparency
|
||||
local _ = { 0 }
|
||||
local K = { 1 }
|
||||
local W = { 2 }
|
||||
local colormap = {
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 255 },
|
||||
{ 255, 255, 255, 255 },
|
||||
}
|
||||
local pixels = {
|
||||
{ _, K, K, K, K, K, _ },
|
||||
{ _, K, W, W, W, K, _ },
|
||||
{ K, K, W, W, W, K, K },
|
||||
{ K, W, W, W, W, W, K },
|
||||
{ _, K, W, W, W, K, _ },
|
||||
{ _, _, K, W, K, _, _ },
|
||||
{ _, _, _, K, _, _, _ },
|
||||
}
|
||||
tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap})
|
||||
|
||||
-- encoding a colormapped image with illegal colormap indexes should error out
|
||||
local colormap = {
|
||||
{ 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 255 },
|
||||
}
|
||||
local status, message = pcall(
|
||||
function ()
|
||||
tga_encoder.image(pixels):encode({colormap=colormap})
|
||||
end
|
||||
)
|
||||
assert(
|
||||
false == status and
|
||||
"init.lua:36: colormap index 2 not in colormap of size 2" == message
|
||||
)
|
||||
|
|
@ -9,566 +9,60 @@ local image = setmetatable({}, {
|
|||
})
|
||||
|
||||
function image:constructor(pixels)
|
||||
self.data = ""
|
||||
self.pixels = pixels
|
||||
self.width = #pixels[1]
|
||||
self.height = #pixels
|
||||
|
||||
self:encode()
|
||||
end
|
||||
|
||||
local pixel_depth_by_color_format = {
|
||||
["Y8"] = 8,
|
||||
["A1R5G5B5"] = 16,
|
||||
["B8G8R8"] = 24,
|
||||
["B8G8R8A8"] = 32,
|
||||
}
|
||||
|
||||
function image:encode_colormap_spec(properties)
|
||||
local colormap = properties.colormap
|
||||
local colormap_pixel_depth = 0
|
||||
if 0 ~= #colormap then
|
||||
colormap_pixel_depth = pixel_depth_by_color_format[
|
||||
properties.color_format
|
||||
]
|
||||
-- ensure that each pixel references a legal colormap entry
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
local colormap_index = pixel[1]
|
||||
if colormap_index >= #colormap then
|
||||
error(
|
||||
"colormap index " .. colormap_index ..
|
||||
" not in colormap of size " .. #colormap
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
local colormap_spec =
|
||||
string.char(0, 0) .. -- first entry index
|
||||
string.char(#colormap % 256, math.floor(#colormap / 256)) .. -- number of entries
|
||||
string.char(colormap_pixel_depth) -- bits per pixel
|
||||
self.data = self.data .. colormap_spec
|
||||
function image:encode_colormap_spec()
|
||||
self.data = self.data
|
||||
.. string.char(0, 0) -- first entry index
|
||||
.. string.char(0, 0) -- number of entries
|
||||
.. string.char(0) -- bits per pixel
|
||||
end
|
||||
|
||||
function image:encode_image_spec(properties)
|
||||
local color_format = properties.color_format
|
||||
assert(
|
||||
"Y8" == color_format or -- (8 bit grayscale = 1 byte = 8 bits)
|
||||
"A1R5G5B5" == color_format or -- (A1R5G5B5 = 2 bytes = 16 bits)
|
||||
"B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits)
|
||||
"B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits)
|
||||
)
|
||||
local scanline_order = properties.scanline_order
|
||||
assert (
|
||||
"bottom-top" == scanline_order or
|
||||
"top-bottom" == scanline_order
|
||||
)
|
||||
local pixel_depth
|
||||
if 0 ~= #properties.colormap then
|
||||
pixel_depth = self.pixel_depth
|
||||
else
|
||||
pixel_depth = pixel_depth_by_color_format[color_format]
|
||||
end
|
||||
assert( nil ~= pixel_depth)
|
||||
-- the origin is the bottom left corner of the image (always)
|
||||
local x_origin_lo = 0
|
||||
local x_origin_hi = 0
|
||||
local y_origin_lo = 0
|
||||
local y_origin_hi = 0
|
||||
local image_descriptor = 0 -- equal to bottom-top scanline order
|
||||
local width_lo = self.width % 256
|
||||
local width_hi = math.floor(self.width / 256)
|
||||
local height_lo = self.height % 256
|
||||
local height_hi = math.floor(self.height / 256)
|
||||
if "top-bottom" == scanline_order then
|
||||
image_descriptor = 32
|
||||
y_origin_lo = height_lo
|
||||
y_origin_hi = height_hi
|
||||
end
|
||||
self.data = self.data .. string.char (
|
||||
x_origin_lo, x_origin_hi,
|
||||
y_origin_lo, y_origin_hi,
|
||||
width_lo, width_hi,
|
||||
height_lo, height_hi,
|
||||
pixel_depth,
|
||||
image_descriptor
|
||||
)
|
||||
function image:encode_image_spec()
|
||||
self.data = self.data
|
||||
.. string.char(0, 0) -- X-origin
|
||||
.. string.char(0, 0) -- Y-origin
|
||||
.. string.char(self.width % 256, math.floor(self.width / 256)) -- width
|
||||
.. string.char(self.height % 256, math.floor(self.height / 256)) -- height
|
||||
.. string.char(24) -- pixel depth (RGB = 3 bytes = 24 bits)
|
||||
.. string.char(0) -- image descriptor
|
||||
end
|
||||
|
||||
function image:encode_colormap(properties)
|
||||
local colormap = properties.colormap
|
||||
if 0 == #colormap then
|
||||
return
|
||||
end
|
||||
local color_format = properties.color_format
|
||||
assert (
|
||||
"A1R5G5B5" == color_format or
|
||||
"B8G8R8" == color_format or
|
||||
"B8G8R8A8" == color_format
|
||||
)
|
||||
local colors = {}
|
||||
if "A1R5G5B5" == color_format then
|
||||
-- Sample depth rescaling is done according to the algorithm presented in:
|
||||
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
|
||||
local max_sample_in = math.pow(2, 8) - 1
|
||||
local max_sample_out = math.pow(2, 5) - 1
|
||||
for i = 1,#colormap,1 do
|
||||
local color = colormap[i]
|
||||
local colorword = 32768 +
|
||||
((math.floor((color[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
|
||||
((math.floor((color[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
|
||||
((math.floor((color[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
|
||||
local color_bytes = string.char(
|
||||
colorword % 256,
|
||||
math.floor(colorword / 256)
|
||||
)
|
||||
colors[#colors + 1] = color_bytes
|
||||
end
|
||||
elseif "B8G8R8" == color_format then
|
||||
for i = 1,#colormap,1 do
|
||||
local color = colormap[i]
|
||||
local color_bytes = string.char(
|
||||
color[3], -- B
|
||||
color[2], -- G
|
||||
color[1] -- R
|
||||
)
|
||||
colors[#colors + 1] = color_bytes
|
||||
end
|
||||
elseif "B8G8R8A8" == color_format then
|
||||
for i = 1,#colormap,1 do
|
||||
local color = colormap[i]
|
||||
local color_bytes = string.char(
|
||||
color[3], -- B
|
||||
color[2], -- G
|
||||
color[1], -- R
|
||||
color[4] -- A
|
||||
)
|
||||
colors[#colors + 1] = color_bytes
|
||||
end
|
||||
end
|
||||
assert( 0 ~= #colors )
|
||||
self.data = self.data .. table.concat(colors)
|
||||
end
|
||||
|
||||
function image:encode_header(properties)
|
||||
local color_format = properties.color_format
|
||||
local colormap = properties.colormap
|
||||
local compression = properties.compression
|
||||
local colormap_type
|
||||
local image_type
|
||||
if "Y8" == color_format and "RAW" == compression then
|
||||
colormap_type = 0
|
||||
image_type = 3 -- grayscale
|
||||
elseif (
|
||||
"A1R5G5B5" == color_format or
|
||||
"B8G8R8" == color_format or
|
||||
"B8G8R8A8" == color_format
|
||||
) then
|
||||
if "RAW" == compression then
|
||||
if 0 ~= #colormap then
|
||||
colormap_type = 1
|
||||
image_type = 1 -- colormapped RGB(A)
|
||||
else
|
||||
colormap_type = 0
|
||||
image_type = 2 -- RAW RGB(A)
|
||||
end
|
||||
elseif "RLE" == compression then
|
||||
colormap_type = 0
|
||||
image_type = 10 -- RLE RGB
|
||||
end
|
||||
end
|
||||
assert( nil ~= colormap_type )
|
||||
assert( nil ~= image_type )
|
||||
function image:encode_header()
|
||||
self.data = self.data
|
||||
.. string.char(0) -- image id
|
||||
.. string.char(colormap_type)
|
||||
.. string.char(image_type)
|
||||
self:encode_colormap_spec(properties) -- color map specification
|
||||
self:encode_image_spec(properties) -- image specification
|
||||
self:encode_colormap(properties)
|
||||
.. string.char(0) -- color map type
|
||||
.. string.char(10) -- image type (RLE RGB = 10)
|
||||
self:encode_colormap_spec() -- color map specification
|
||||
self:encode_image_spec() -- image specification
|
||||
end
|
||||
|
||||
function image:encode_data(properties)
|
||||
local color_format = properties.color_format
|
||||
local colormap = properties.colormap
|
||||
local compression = properties.compression
|
||||
|
||||
local data_length_before = #self.data
|
||||
if "Y8" == color_format and "RAW" == compression then
|
||||
if 8 == self.pixel_depth then
|
||||
self:encode_data_Y8_as_Y8_raw()
|
||||
elseif 24 == self.pixel_depth then
|
||||
self:encode_data_R8G8B8_as_Y8_raw()
|
||||
end
|
||||
elseif "A1R5G5B5" == color_format then
|
||||
if 0 ~= #colormap then
|
||||
if "RAW" == compression then
|
||||
if 8 == self.pixel_depth then
|
||||
self:encode_data_Y8_as_Y8_raw()
|
||||
end
|
||||
end
|
||||
else
|
||||
if "RAW" == compression then
|
||||
self:encode_data_R8G8B8_as_A1R5G5B5_raw()
|
||||
elseif "RLE" == compression then
|
||||
self:encode_data_R8G8B8_as_A1R5G5B5_rle()
|
||||
end
|
||||
end
|
||||
elseif "B8G8R8" == color_format then
|
||||
if 0 ~= #colormap then
|
||||
if "RAW" == compression then
|
||||
if 8 == self.pixel_depth then
|
||||
self:encode_data_Y8_as_Y8_raw()
|
||||
end
|
||||
end
|
||||
else
|
||||
if "RAW" == compression then
|
||||
self:encode_data_R8G8B8_as_B8G8R8_raw()
|
||||
elseif "RLE" == compression then
|
||||
self:encode_data_R8G8B8_as_B8G8R8_rle()
|
||||
end
|
||||
end
|
||||
elseif "B8G8R8A8" == color_format then
|
||||
if 0 ~= #colormap then
|
||||
if "RAW" == compression then
|
||||
if 8 == self.pixel_depth then
|
||||
self:encode_data_Y8_as_Y8_raw()
|
||||
end
|
||||
end
|
||||
else
|
||||
if "RAW" == compression then
|
||||
self:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
|
||||
elseif "RLE" == compression then
|
||||
self:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
|
||||
end
|
||||
end
|
||||
end
|
||||
local data_length_after = #self.data
|
||||
assert(
|
||||
data_length_after ~= data_length_before,
|
||||
"No data encoded for color format: " .. color_format
|
||||
)
|
||||
end
|
||||
|
||||
function image:encode_data_Y8_as_Y8_raw()
|
||||
assert(8 == self.pixel_depth)
|
||||
local raw_pixels = {}
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
local raw_pixel = string.char(pixel[1])
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
end
|
||||
end
|
||||
self.data = self.data .. table.concat(raw_pixels)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8_as_Y8_raw()
|
||||
assert(24 == self.pixel_depth)
|
||||
local raw_pixels = {}
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
-- the HSP RGB to brightness formula is
|
||||
-- sqrt( 0.299 r² + .587 g² + .114 b² )
|
||||
-- see <https://alienryderflex.com/hsp.html>
|
||||
local gray = math.floor(
|
||||
math.sqrt(
|
||||
0.299 * pixel[1]^2 +
|
||||
0.587 * pixel[2]^2 +
|
||||
0.114 * pixel[3]^2
|
||||
) + 0.5
|
||||
)
|
||||
local raw_pixel = string.char(gray)
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
end
|
||||
end
|
||||
self.data = self.data .. table.concat(raw_pixels)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8_as_A1R5G5B5_raw()
|
||||
assert(24 == self.pixel_depth)
|
||||
local raw_pixels = {}
|
||||
-- Sample depth rescaling is done according to the algorithm presented in:
|
||||
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
|
||||
local max_sample_in = math.pow(2, 8) - 1
|
||||
local max_sample_out = math.pow(2, 5) - 1
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
local colorword = 32768 +
|
||||
((math.floor((pixel[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) +
|
||||
((math.floor((pixel[2] * max_sample_out / max_sample_in) + 0.5)) * 32) +
|
||||
((math.floor((pixel[3] * max_sample_out / max_sample_in) + 0.5)) * 1)
|
||||
local raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
end
|
||||
end
|
||||
self.data = self.data .. table.concat(raw_pixels)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8_as_A1R5G5B5_rle()
|
||||
assert(24 == self.pixel_depth)
|
||||
local colorword = nil
|
||||
local previous_r = nil
|
||||
local previous_g = nil
|
||||
local previous_b = nil
|
||||
local raw_pixel = ''
|
||||
local raw_pixels = {}
|
||||
function image:encode_data()
|
||||
local current_pixel = ''
|
||||
local previous_pixel = ''
|
||||
local count = 1
|
||||
local packets = {}
|
||||
local raw_packet = ''
|
||||
local rle_packet = ''
|
||||
-- Sample depth rescaling is done according to the algorithm presented in:
|
||||
-- <https://www.w3.org/TR/2003/REC-PNG-20031110/#13Sample-depth-rescaling>
|
||||
local max_sample_in = math.pow(2, 8) - 1
|
||||
local max_sample_out = math.pow(2, 5) - 1
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
|
||||
if nil ~= previous_r then
|
||||
colorword = 32768 +
|
||||
((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
|
||||
((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
|
||||
((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
|
||||
if 1 == count then
|
||||
-- remember pixel verbatim for raw encoding
|
||||
raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
if 128 == #raw_pixels then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
end
|
||||
count = 1
|
||||
previous_r = pixel[1]
|
||||
previous_g = pixel[2]
|
||||
previous_b = pixel[3]
|
||||
else
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
colorword = 32768 +
|
||||
((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) +
|
||||
((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) +
|
||||
((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1)
|
||||
if 1 == count then
|
||||
raw_pixel = string.char(colorword % 256, math.floor(colorword / 256))
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256))
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
self.data = self.data .. table.concat(packets)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8_as_B8G8R8_raw()
|
||||
assert(24 == self.pixel_depth)
|
||||
local raw_pixels = {}
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
local raw_pixel = string.char(pixel[3], pixel[2], pixel[1])
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
end
|
||||
end
|
||||
self.data = self.data .. table.concat(raw_pixels)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8_as_B8G8R8_rle()
|
||||
assert(24 == self.pixel_depth)
|
||||
local previous_r = nil
|
||||
local previous_g = nil
|
||||
local previous_b = nil
|
||||
local raw_pixel = ''
|
||||
local raw_pixels = {}
|
||||
local count = 1
|
||||
local packets = {}
|
||||
local raw_packet = ''
|
||||
local rle_packet = ''
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then
|
||||
if nil ~= previous_r then
|
||||
if 1 == count then
|
||||
-- remember pixel verbatim for raw encoding
|
||||
raw_pixel = string.char(previous_b, previous_g, previous_r)
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
if 128 == #raw_pixels then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
end
|
||||
current_pixel = string.char(pixel[3], pixel[2], pixel[1])
|
||||
if current_pixel ~= previous_pixel or count == 128 then
|
||||
packets[#packets +1] = rle_packet
|
||||
count = 1
|
||||
previous_r = pixel[1]
|
||||
previous_g = pixel[2]
|
||||
previous_b = pixel[3]
|
||||
previous_pixel = current_pixel
|
||||
else
|
||||
count = count + 1
|
||||
end
|
||||
rle_packet = string.char(128 + count - 1) .. current_pixel
|
||||
end
|
||||
end
|
||||
if 1 == count then
|
||||
raw_pixel = string.char(previous_b, previous_g, previous_r)
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r)
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
self.data = self.data .. table.concat(packets)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw()
|
||||
assert(32 == self.pixel_depth)
|
||||
local raw_pixels = {}
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
local raw_pixel = string.char(pixel[3], pixel[2], pixel[1], pixel[4])
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
end
|
||||
end
|
||||
self.data = self.data .. table.concat(raw_pixels)
|
||||
end
|
||||
|
||||
function image:encode_data_R8G8B8A8_as_B8G8R8A8_rle()
|
||||
assert(32 == self.pixel_depth)
|
||||
local previous_r = nil
|
||||
local previous_g = nil
|
||||
local previous_b = nil
|
||||
local previous_a = nil
|
||||
local raw_pixel = ''
|
||||
local raw_pixels = {}
|
||||
local count = 1
|
||||
local packets = {}
|
||||
local raw_packet = ''
|
||||
local rle_packet = ''
|
||||
for _, row in ipairs(self.pixels) do
|
||||
for _, pixel in ipairs(row) do
|
||||
if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or pixel[4] ~= previous_a or count == 128 then
|
||||
if nil ~= previous_r then
|
||||
if 1 == count then
|
||||
-- remember pixel verbatim for raw encoding
|
||||
raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
if 128 == #raw_pixels then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
end
|
||||
count = 1
|
||||
previous_r = pixel[1]
|
||||
previous_g = pixel[2]
|
||||
previous_b = pixel[3]
|
||||
previous_a = pixel[4]
|
||||
else
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
if 1 == count then
|
||||
raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a)
|
||||
raw_pixels[#raw_pixels + 1] = raw_pixel
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
else
|
||||
-- encode raw pixels, if any
|
||||
if #raw_pixels > 0 then
|
||||
raw_packet = string.char(#raw_pixels - 1)
|
||||
packets[#packets + 1] = raw_packet
|
||||
for i=1, #raw_pixels do
|
||||
packets[#packets +1] = raw_pixels[i]
|
||||
end
|
||||
raw_pixels = {}
|
||||
end
|
||||
-- RLE encoding
|
||||
rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a)
|
||||
packets[#packets +1] = rle_packet
|
||||
end
|
||||
packets[#packets +1] = rle_packet
|
||||
self.data = self.data .. table.concat(packets)
|
||||
end
|
||||
|
||||
|
|
@ -581,45 +75,15 @@ function image:encode_footer()
|
|||
.. string.char(0)
|
||||
end
|
||||
|
||||
function image:encode(properties)
|
||||
local properties = properties or {}
|
||||
properties.colormap = properties.colormap or {}
|
||||
properties.compression = properties.compression or "RAW"
|
||||
properties.scanline_order = properties.scanline_order or "bottom-top"
|
||||
|
||||
self.pixel_depth = #self.pixels[1][1] * 8
|
||||
|
||||
local color_format_defaults_by_pixel_depth = {
|
||||
[8] = "Y8",
|
||||
[24] = "B8G8R8",
|
||||
[32] = "B8G8R8A8",
|
||||
}
|
||||
if nil == properties.color_format then
|
||||
if 0 ~= #properties.colormap then
|
||||
properties.color_format =
|
||||
color_format_defaults_by_pixel_depth[
|
||||
#properties.colormap[1] * 8
|
||||
]
|
||||
else
|
||||
properties.color_format =
|
||||
color_format_defaults_by_pixel_depth[
|
||||
self.pixel_depth
|
||||
]
|
||||
end
|
||||
end
|
||||
assert( nil ~= properties.color_format )
|
||||
|
||||
self.data = ""
|
||||
self:encode_header(properties) -- header
|
||||
function image:encode()
|
||||
self:encode_header() -- header
|
||||
-- no color map and image id data
|
||||
self:encode_data(properties) -- encode data
|
||||
self:encode_data() -- encode data
|
||||
-- no extension or developer area
|
||||
self:encode_footer() -- footer
|
||||
end
|
||||
|
||||
function image:save(filename, properties)
|
||||
self:encode(properties)
|
||||
|
||||
function image:save(filename)
|
||||
local f = assert(io.open(filename, "wb"))
|
||||
f:write(self.data)
|
||||
f:close()
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
dofile("init.lua")
|
||||
|
||||
local colormap = {
|
||||
{ 0, 0, 0 }, -- black
|
||||
{ 255, 255, 255 }, -- white
|
||||
{ 255, 0, 0 }, -- red
|
||||
{ 0, 255, 0 }, -- green
|
||||
{ 0, 0, 255 }, -- blue
|
||||
}
|
||||
|
||||
local _ = { 0 }
|
||||
local W = { 1 }
|
||||
local R = { 2 }
|
||||
local G = { 3 }
|
||||
local B = { 4 }
|
||||
|
||||
local pixels_tiny = {
|
||||
{ W, W, W, W, W, W, W, W, W, W, W, W, },
|
||||
{ W, _, _, _, _, _, _, _, _, _, _, W, },
|
||||
{ W, _, _, _, _, _, _, B, _, B, _, W, },
|
||||
{ W, _, _, _, _, _, _, B, B, B, _, W, },
|
||||
{ W, _, _, _, G, G, G, B, _, B, _, W, },
|
||||
{ W, _, _, _, G, _, G, B, B, B, _, W, },
|
||||
{ W, _, _, R, G, _, _, _, _, _, _, W, },
|
||||
{ W, _, _, R, G, G, G, _, _, _, _, W, },
|
||||
{ W, _, _, R, _, _, _, _, _, _, _, W, },
|
||||
{ W, _, R, R, R, _, _, _, _, _, _, W, },
|
||||
{ W, _, _, _, _, _, _, _, _, _, _, W, },
|
||||
{ W, W, W, W, W, W, W, W, W, W, W, W, },
|
||||
}
|
||||
|
||||
local pixels_huge = {}
|
||||
|
||||
local size_tiny = #pixels_tiny
|
||||
local size_huge = 1200
|
||||
local scale = size_huge / size_tiny
|
||||
|
||||
for x_huge = 1,size_huge,1 do
|
||||
local x_tiny = math.ceil( x_huge / scale )
|
||||
for z_huge = 1,size_huge,1 do
|
||||
local z_tiny = math.ceil( z_huge / scale )
|
||||
if nil == pixels_huge[z_huge] then
|
||||
pixels_huge[z_huge] = {}
|
||||
end
|
||||
pixels_huge[z_huge][x_huge] = pixels_tiny[z_tiny][x_tiny]
|
||||
end
|
||||
end
|
||||
|
||||
tga_encoder.image(pixels_tiny):save("logo_tiny.tga", {colormap=colormap})
|
||||
tga_encoder.image(pixels_huge):save("logo_huge.tga", {colormap=colormap})
|
||||
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
name = tga_encoder
|
||||
author = Fleckenstein
|
||||
description = A TGA Encoder written in Lua without the use of external Libraries.
|
||||
|
|
|
|||
|
|
@ -1,180 +0,0 @@
|
|||
#!/usr/bin/env lua5.1
|
||||
dofile("../init.lua")
|
||||
|
||||
local _ = { 0 }
|
||||
local R = { 1 }
|
||||
local G = { 2 }
|
||||
local B = { 3 }
|
||||
|
||||
local pixels_colormapped_bt = {
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
}
|
||||
|
||||
local pixels_colormapped_tb = {
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
}
|
||||
|
||||
image_colormapped_bt = tga_encoder.image(pixels_colormapped_bt)
|
||||
image_colormapped_tb = tga_encoder.image(pixels_colormapped_tb)
|
||||
|
||||
colormap_32bpp = {
|
||||
{ 0, 0, 0, 128 },
|
||||
{ 255, 0, 0, 255 },
|
||||
{ 0, 255, 0, 255 },
|
||||
{ 0, 0, 255, 255 },
|
||||
}
|
||||
image_colormapped_bt:save(
|
||||
"type1_32bpp_bt.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_colormapped_tb:save(
|
||||
"type1_32bpp_tb.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "B8G8R8A8", scanline_order = "top-bottom" }
|
||||
)
|
||||
image_colormapped_bt:save(
|
||||
"type1_16bpp_bt.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_colormapped_tb:save(
|
||||
"type1_16bpp_tb.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "A1R5G5B5", scanline_order = "top-bottom" }
|
||||
)
|
||||
|
||||
colormap_24bpp = {
|
||||
{ 0, 0, 0 },
|
||||
{ 255, 0, 0 },
|
||||
{ 0, 255, 0 },
|
||||
{ 0, 0, 255 },
|
||||
}
|
||||
image_colormapped_bt:save(
|
||||
"type1_24bpp_bt.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_colormapped_tb:save(
|
||||
"type1_24bpp_tb.tga",
|
||||
{ colormap = colormap_32bpp, color_format = "B8G8R8", scanline_order = "top-bottom" }
|
||||
)
|
||||
|
||||
local _ = { 0, 0, 0, 128 }
|
||||
local R = { 255, 0, 0, 255 }
|
||||
local G = { 0, 255, 0, 255 }
|
||||
local B = { 0, 0, 255, 255 }
|
||||
|
||||
local pixels_rgba_bt = {
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
}
|
||||
|
||||
local pixels_rgba_tb = {
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
}
|
||||
|
||||
image_rgba_bt = tga_encoder.image(pixels_rgba_bt)
|
||||
image_rgba_tb = tga_encoder.image(pixels_rgba_tb)
|
||||
|
||||
image_rgba_bt:save(
|
||||
"type2_32bpp_bt.tga",
|
||||
{ color_format="B8G8R8A8", compression="RAW", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgba_tb:save(
|
||||
"type2_32bpp_tb.tga",
|
||||
{ color_format="B8G8R8A8", compression="RAW", scanline_order = "top-bottom" }
|
||||
)
|
||||
image_rgba_bt:save(
|
||||
"type10_32bpp_bt.tga",
|
||||
{ color_format="B8G8R8A8", compression="RLE", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgba_tb:save(
|
||||
"type10_32bpp_tb.tga",
|
||||
{ color_format="B8G8R8A8", compression="RLE", scanline_order = "top-bottom" }
|
||||
)
|
||||
|
||||
local _ = { 0, 0, 0 }
|
||||
local R = { 255, 0, 0 }
|
||||
local G = { 0, 255, 0 }
|
||||
local B = { 0, 0, 255 }
|
||||
|
||||
local pixels_rgb_bt = {
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
}
|
||||
|
||||
local pixels_rgb_tb = {
|
||||
{ R, R, R, _, _, _, _, _, },
|
||||
{ _, R, _, _, _, _, _, _, },
|
||||
{ _, R, G, G, G, _, _, _, },
|
||||
{ _, R, G, _, _, _, _, _, },
|
||||
{ _, _, G, _, G, B, B, B, },
|
||||
{ _, _, G, G, G, B, _, B, },
|
||||
{ _, _, _, _, _, B, B, B, },
|
||||
{ _, _, _, _, _, B, _, B, },
|
||||
}
|
||||
|
||||
image_rgb_bt = tga_encoder.image(pixels_rgb_bt)
|
||||
image_rgb_tb = tga_encoder.image(pixels_rgb_tb)
|
||||
|
||||
image_rgb_bt:save(
|
||||
"type2_24bpp_bt.tga",
|
||||
{ color_format="B8G8R8", compression="RAW", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgb_tb:save(
|
||||
"type2_24bpp_tb.tga",
|
||||
{ color_format="B8G8R8", compression="RAW", scanline_order = "top-bottom" }
|
||||
)
|
||||
image_rgb_bt:save(
|
||||
"type10_24bpp_bt.tga",
|
||||
{ color_format="B8G8R8", compression="RLE", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgb_tb:save(
|
||||
"type10_24bpp_tb.tga",
|
||||
{ color_format="B8G8R8", compression="RLE", scanline_order = "top-bottom" }
|
||||
)
|
||||
image_rgb_bt:save(
|
||||
"type2_16bpp_bt.tga",
|
||||
{ color_format="A1R5G5B5", compression="RAW", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgb_tb:save(
|
||||
"type2_16bpp_tb.tga",
|
||||
{ color_format="A1R5G5B5", compression="RAW", scanline_order = "top-bottom" }
|
||||
)
|
||||
image_rgb_bt:save(
|
||||
"type10_16bpp_bt.tga",
|
||||
{ color_format="A1R5G5B5", compression="RLE", scanline_order = "bottom-top" }
|
||||
)
|
||||
image_rgb_tb:save(
|
||||
"type10_16bpp_tb.tga",
|
||||
{ color_format="A1R5G5B5", compression="RLE", scanline_order = "top-bottom" }
|
||||
)
|
||||
|
|
@ -113,55 +113,6 @@ local function disable_physics(object, luaentity, ignore_check, reset_movement)
|
|||
end
|
||||
end
|
||||
|
||||
local function try_object_pickup(player, inv, object, checkpos)
|
||||
if not inv then return end
|
||||
|
||||
local le = object:get_luaentity()
|
||||
|
||||
-- Check magnet timer
|
||||
if not (le._magnet_timer >= 0) then return end
|
||||
if not (le._magnet_timer < item_drop_settings.magnet_time) then return end
|
||||
|
||||
-- Don't try to collect again
|
||||
if le._removed then return end
|
||||
|
||||
-- Ignore if itemstring is not set yet
|
||||
if le.itemstring == "" then return end
|
||||
|
||||
-- Add what we can to the inventory
|
||||
local itemstack = ItemStack(le.itemstring)
|
||||
local leftovers = inv:add_item("main", itemstack )
|
||||
|
||||
check_pickup_achievements(object, player)
|
||||
|
||||
if leftovers:is_empty() then
|
||||
-- Destroy entity
|
||||
-- This just prevents this section to be run again because object:remove() doesn't remove the item immediately.
|
||||
le.target = checkpos
|
||||
le._removed = true
|
||||
|
||||
-- Stop the object
|
||||
object:set_velocity(vector.zero())
|
||||
object:set_acceleration(vector.zero())
|
||||
object:move_to(checkpos)
|
||||
|
||||
-- Update sound pool
|
||||
local name = player:get_player_name()
|
||||
pool[name] = ( pool[name] or 0 ) + 1
|
||||
|
||||
-- Make sure the object gets removed
|
||||
minetest.after(0.25, function()
|
||||
--safety check
|
||||
if object and object:get_luaentity() then
|
||||
object:remove()
|
||||
end
|
||||
end)
|
||||
else
|
||||
-- Update entity itemstring
|
||||
le.itemstring = leftovers:to_string()
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_globalstep(function(_)
|
||||
tick = not tick
|
||||
|
||||
|
|
@ -196,7 +147,40 @@ minetest.register_globalstep(function(_)
|
|||
object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and object:get_luaentity()._magnet_timer
|
||||
and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
|
||||
|
||||
try_object_pickup( player, inv, object, checkpos )
|
||||
if object:get_luaentity()._magnet_timer >= 0 and
|
||||
object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and
|
||||
inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
||||
|
||||
-- Collection
|
||||
if not object:get_luaentity()._removed then
|
||||
-- Ignore if itemstring is not set yet
|
||||
if object:get_luaentity().itemstring ~= "" then
|
||||
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
|
||||
|
||||
check_pickup_achievements(object, player)
|
||||
|
||||
-- Destroy entity
|
||||
-- This just prevents this section to be run again because object:remove() doesn't remove the item immediately.
|
||||
object:get_luaentity().target = checkpos
|
||||
object:get_luaentity()._removed = true
|
||||
|
||||
object:set_velocity(vector.zero())
|
||||
object:set_acceleration(vector.zero())
|
||||
|
||||
object:move_to(checkpos)
|
||||
|
||||
pool[name] = pool[name] + 1
|
||||
|
||||
minetest.after(0.25, function()
|
||||
--safety check
|
||||
if object and object:get_luaentity() then
|
||||
object:remove()
|
||||
end
|
||||
end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
elseif not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "mcl_experience:orb" then
|
||||
local entity = object:get_luaentity()
|
||||
entity.collector = player:get_player_name()
|
||||
|
|
|
|||
|
|
@ -134,34 +134,4 @@ function mcl_minecarts:get_rail_direction(pos_, dir, ctrl, old_switch, railtype)
|
|||
end
|
||||
end
|
||||
return {x=0, y=0, z=0}
|
||||
end
|
||||
|
||||
local plane_adjacents = {
|
||||
vector.new(-1,0,0),
|
||||
vector.new(1,0,0),
|
||||
vector.new(0,0,-1),
|
||||
vector.new(0,0,1),
|
||||
}
|
||||
|
||||
function mcl_minecarts:get_start_direction(pos)
|
||||
local dir
|
||||
local i = 0
|
||||
while (not dir and i < #plane_adjacents) do
|
||||
i = i+1
|
||||
local node = minetest.get_node_or_nil(vector.add(pos, plane_adjacents[i]))
|
||||
if node ~= nil
|
||||
and minetest.get_item_group(node.name, "rail") == 0
|
||||
and minetest.get_item_group(node.name, "solid") == 1
|
||||
and minetest.get_item_group(node.name, "opaque") == 1
|
||||
then
|
||||
dir = mcl_minecarts:check_front_up_down(pos, vector.multiply(plane_adjacents[i], -1), true)
|
||||
end
|
||||
end
|
||||
return dir
|
||||
end
|
||||
|
||||
function mcl_minecarts:set_velocity(obj, dir, factor)
|
||||
obj._velocity = vector.multiply(dir, factor or 3)
|
||||
obj._old_pos = nil
|
||||
obj._punched = true
|
||||
end
|
||||
end
|
||||
|
|
@ -241,7 +241,9 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
|||
if vector.equals(cart_dir, {x=0, y=0, z=0}) then
|
||||
return
|
||||
end
|
||||
mcl_minecarts:set_velocity(self, cart_dir)
|
||||
self._velocity = vector.multiply(cart_dir, 3)
|
||||
self._old_pos = nil
|
||||
self._punched = true
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -298,7 +300,9 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
|||
time_from_last_punch = math.min(time_from_last_punch, tool_capabilities.full_punch_interval)
|
||||
local f = 3 * (time_from_last_punch / tool_capabilities.full_punch_interval)
|
||||
|
||||
mcl_minecarts:set_velocity(self, cart_dir, f)
|
||||
self._velocity = vector.multiply(cart_dir, f)
|
||||
self._old_pos = nil
|
||||
self._punched = true
|
||||
end
|
||||
|
||||
cart.on_activate_by_rail = on_activate_by_rail
|
||||
|
|
@ -466,7 +470,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
|||
return
|
||||
end
|
||||
|
||||
local dir, last_switch, restart_pos = nil, nil, nil
|
||||
local dir, last_switch = nil, nil
|
||||
if not pos then
|
||||
pos = self.object:get_pos()
|
||||
end
|
||||
|
|
@ -493,9 +497,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
|||
minetest.swap_node(rou_pos, newnode)
|
||||
mesecon.receptor_on(rou_pos)
|
||||
end
|
||||
if node.name == "mcl_minecarts:golden_rail_on" then
|
||||
restart_pos = rou_pos
|
||||
end
|
||||
if node_old.name == "mcl_minecarts:detector_rail_on" then
|
||||
local newnode = {name="mcl_minecarts:detector_rail", param2 = node_old.param2}
|
||||
minetest.swap_node(rou_old, newnode)
|
||||
|
|
@ -646,14 +647,6 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
|
|||
if update.pos then
|
||||
self.object:set_pos(pos)
|
||||
end
|
||||
|
||||
-- stopped on "mcl_minecarts:golden_rail_on"
|
||||
if vector.equals(vel, {x=0, y=0, z=0}) and restart_pos then
|
||||
local dir = mcl_minecarts:get_start_direction(restart_pos)
|
||||
if dir then
|
||||
mcl_minecarts:set_velocity(self, dir)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function cart:get_staticdata()
|
||||
|
|
@ -694,15 +687,7 @@ function mcl_minecarts.place_minecart(itemstack, pointed_thing, placer)
|
|||
if le then
|
||||
le._railtype = railtype
|
||||
end
|
||||
local cart_dir
|
||||
if node.name == "mcl_minecarts:golden_rail_on" then
|
||||
cart_dir = mcl_minecarts:get_start_direction(railpos)
|
||||
end
|
||||
if cart_dir then
|
||||
mcl_minecarts:set_velocity(le, cart_dir)
|
||||
else
|
||||
cart_dir = mcl_minecarts:get_rail_direction(railpos, {x=1, y=0, z=0}, nil, nil, railtype)
|
||||
end
|
||||
local cart_dir = mcl_minecarts:get_rail_direction(railpos, {x=1, y=0, z=0}, nil, nil, railtype)
|
||||
cart:set_yaw(minetest.dir_to_yaw(cart_dir))
|
||||
|
||||
local pname = ""
|
||||
|
|
|
|||
|
|
@ -112,22 +112,6 @@ register_rail("mcl_minecarts:golden_rail_on",
|
|||
onstate = "mcl_minecarts:golden_rail_on",
|
||||
rules = rail_rules_long,
|
||||
},
|
||||
effector = {
|
||||
action_on = function(pos, node)
|
||||
local dir = mcl_minecarts:get_start_direction(pos)
|
||||
if not dir then return end
|
||||
local objs = minetest.get_objects_inside_radius(pos, 1)
|
||||
for _, o in pairs(objs) do
|
||||
local l = o:get_luaentity()
|
||||
local v = o:get_velocity()
|
||||
if l and string.sub(l.name, 1, 14) == "mcl_minecarts:"
|
||||
and v and vector.equals(v, vector.zero())
|
||||
then
|
||||
mcl_minecarts:set_velocity(l, dir)
|
||||
end
|
||||
end
|
||||
end,
|
||||
},
|
||||
},
|
||||
drop = "mcl_minecarts:golden_rail",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ function mob_class:toggle_sit(clicker,p)
|
|||
particle = "mobs_mc_wolf_icon_roam.png"
|
||||
self.order = "roam"
|
||||
self.state = "stand"
|
||||
self.walk_chance = 50
|
||||
self.walk_chance = default_walk_chance
|
||||
self.jump = true
|
||||
self:set_animation("stand")
|
||||
-- TODO: Add sitting model
|
||||
|
|
|
|||
|
|
@ -325,19 +325,12 @@ function mcl_mobs.register_mob(name, def)
|
|||
|
||||
_spawner = def._spawner,
|
||||
}
|
||||
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
||||
|
||||
if minetest.get_modpath("doc_identifier") ~= nil then
|
||||
doc.sub.identifier.register_object(name, "basics", "mobs")
|
||||
|
||||
if def.unused ~= true then
|
||||
doc.add_entry("mobs", name, {
|
||||
name = def.description or name,
|
||||
data = final_def,
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_entity(name, setmetatable(final_def,mcl_mobs.mob_class_meta))
|
||||
end -- END mcl_mobs.register_mob function
|
||||
|
||||
|
||||
|
|
@ -369,13 +362,12 @@ function mcl_mobs.register_arrow(name, def)
|
|||
collisionbox = {0, 0, 0, 0, 0, 0}, -- remove box around arrows
|
||||
timer = 0,
|
||||
switch = 0,
|
||||
_lifetime = def._lifetime or 7,
|
||||
_lifetime = def._lifetime or 150,
|
||||
owner_id = def.owner_id,
|
||||
rotate = def.rotate,
|
||||
on_punch = def.on_punch or function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
|
||||
local vel = self.object:get_velocity():length()
|
||||
self.object:set_velocity({x=dir.x * vel, y=dir.y * vel, z=dir.z * vel})
|
||||
self._puncher = puncher
|
||||
on_punch = def.on_punch or function(self)
|
||||
local vel = self.object:get_velocity()
|
||||
self.object:set_velocity({x=vel.x * -1, y=vel.y * -1, z=vel.z * -1})
|
||||
end,
|
||||
collisionbox = def.collisionbox or {0, 0, 0, 0, 0, 0},
|
||||
automatic_face_movement_dir = def.rotate
|
||||
|
|
@ -385,7 +377,7 @@ function mcl_mobs.register_arrow(name, def)
|
|||
|
||||
on_step = def.on_step or function(self, dtime)
|
||||
|
||||
self.timer = self.timer + dtime
|
||||
self.timer = self.timer + 1
|
||||
|
||||
local pos = self.object:get_pos()
|
||||
|
||||
|
|
@ -451,24 +443,24 @@ function mcl_mobs.register_arrow(name, def)
|
|||
|
||||
if self.hit_player or self.hit_mob or self.hit_object then
|
||||
|
||||
for _,object in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
|
||||
for _,player in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do
|
||||
|
||||
if self.hit_player
|
||||
and object:is_player() then
|
||||
and player:is_player() then
|
||||
|
||||
self.hit_player(self, object)
|
||||
self.hit_player(self, player)
|
||||
self.object:remove();
|
||||
return
|
||||
end
|
||||
|
||||
local entity = object:get_luaentity()
|
||||
local entity = player:get_luaentity()
|
||||
|
||||
if entity
|
||||
and self.hit_mob
|
||||
and entity.is_mob == true
|
||||
and (tostring(object) ~= self.owner_id or self.timer > 2)
|
||||
and tostring(player) ~= self.owner_id
|
||||
and entity.name ~= self.object:get_luaentity().name then
|
||||
self.hit_mob(self, object)
|
||||
self.hit_mob(self, player)
|
||||
self.object:remove();
|
||||
return
|
||||
end
|
||||
|
|
@ -476,9 +468,9 @@ function mcl_mobs.register_arrow(name, def)
|
|||
if entity
|
||||
and self.hit_object
|
||||
and (not entity.is_mob)
|
||||
and (tostring(object) ~= self.owner_id or self.timer > 2)
|
||||
and tostring(player) ~= self.owner_id
|
||||
and entity.name ~= self.object:get_luaentity().name then
|
||||
self.hit_object(self, object)
|
||||
self.hit_object(self, player)
|
||||
self.object:remove();
|
||||
return
|
||||
end
|
||||
|
|
|
|||
|
|
@ -761,61 +761,6 @@ function mob_class:do_env_damage()
|
|||
end
|
||||
end
|
||||
|
||||
-- Cactus damage
|
||||
local near = minetest.find_node_near(pos, 1, "mcl_core:cactus", true)
|
||||
if not near and near ~= nil then
|
||||
near = find_node_near({x=pos.x, y=pos.y-1, z=pos.z}, 1, "mcl_core:cactus", true)
|
||||
end
|
||||
if near then
|
||||
-- is mob touching the cactus?
|
||||
local dist = vector.distance(pos, near)
|
||||
local dist_feet = vector.distance({x=pos.x, y=pos.y-1, z=pos.z}, near)
|
||||
local large_mob = false
|
||||
local medium_mob = false
|
||||
if self.name == "mobs_mc:ender_dragon" or
|
||||
self.name == "mobs_mc:ghast" or
|
||||
self.name == "mobs_mc:guardian_elder" or
|
||||
self.name == "mobs_mc:slime_big" or
|
||||
self.name == "mobs_mc:magma_cube_big" or
|
||||
self.name == "mobs_mc:wither" then
|
||||
|
||||
large_mob = true
|
||||
elseif self.name == "mobs_mc:hoglin" or
|
||||
self.name == "mobs_mc:zoglin" or
|
||||
self.name == "mobs_mc:horse" or
|
||||
self.name == "mobs_mc:skeleton_horse" or
|
||||
self.name == "mobs_mc:zombie_horse" or
|
||||
self.name == "mobs_mc:donkey" or
|
||||
self.name == "mobs_mc:mule" or
|
||||
self.name == "mobs_mc:iron_golem" or
|
||||
self.name == "mobs_mc:polar_bear" or
|
||||
self.name == "mobs_mc:spider" or
|
||||
self.name == "mobs_mc:cave_spider" or
|
||||
self.name == "mobs_mc:strider" then
|
||||
|
||||
medium_mob = true
|
||||
end
|
||||
if (not large_mob and not medium_mob and (dist < 1.03 or dist_feet < 1.6)) or (medium_mob and (dist < 1.165 or dist_feet < 1.73)) or (large_mob and (dist < 1.25 or dist_feet < 1.9)) then
|
||||
if self.health ~= 0 then
|
||||
self:damage_mob("cactus", 2)
|
||||
|
||||
if self:check_for_death("cactus", {type = "environment",
|
||||
pos = pos, node = self.standing_in}) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-- is mob standing on the cactus?
|
||||
if self.standing_on == "mcl_core:cactus" or self.standing_in == "mcl_core:cactus" or self.standing_under == "mcl_core:cactus" then
|
||||
self:damage_mob("cactus", 2)
|
||||
|
||||
if self:check_for_death("cactus", {type = "environment",
|
||||
pos = pos, node = self.standing_in}) then
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
-- Drowning damage
|
||||
if self.breath_max ~= -1 then
|
||||
local drowning = false
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ local get_node = minetest.get_node
|
|||
local get_item_group = minetest.get_item_group
|
||||
local get_node_light = minetest.get_node_light
|
||||
local find_nodes_in_area_under_air = minetest.find_nodes_in_area_under_air
|
||||
local mt_get_biome_name = minetest.get_biome_name
|
||||
local get_biome_name = minetest.get_biome_name
|
||||
local get_objects_inside_radius = minetest.get_objects_inside_radius
|
||||
local get_connected_players = minetest.get_connected_players
|
||||
|
||||
|
|
@ -664,29 +664,7 @@ local function has_room(self,pos)
|
|||
return true
|
||||
end
|
||||
|
||||
mcl_mobs.custom_biomecheck = nil
|
||||
|
||||
function mcl_mobs.register_custom_biomecheck(custom_biomecheck)
|
||||
mcl_mobs.custom_biomecheck = custom_biomecheck
|
||||
end
|
||||
|
||||
|
||||
local function get_biome_name(pos)
|
||||
if mcl_mobs.custom_biomecheck then
|
||||
return mcl_mobs.custom_biomecheck (pos)
|
||||
else
|
||||
local gotten_biome = minetest.get_biome_data(pos)
|
||||
|
||||
if not gotten_biome then
|
||||
return
|
||||
end
|
||||
|
||||
gotten_biome = mt_get_biome_name(gotten_biome.biome)
|
||||
--minetest.log ("biome: " .. dump(gotten_biome))
|
||||
|
||||
return gotten_biome
|
||||
end
|
||||
end
|
||||
|
||||
local function spawn_check(pos, spawn_def)
|
||||
if not spawn_def or not pos then return end
|
||||
|
|
@ -696,10 +674,11 @@ local function spawn_check(pos, spawn_def)
|
|||
local mob_def = minetest.registered_entities[spawn_def.name]
|
||||
local mob_type = mob_def.type
|
||||
local gotten_node = get_node(pos).name
|
||||
if not gotten_node then return end
|
||||
local gotten_biome = minetest.get_biome_data(pos)
|
||||
|
||||
local biome_name = get_biome_name(pos)
|
||||
if not biome_name then return end
|
||||
if not gotten_node or not gotten_biome then return end
|
||||
|
||||
gotten_biome = get_biome_name(gotten_biome.biome) --makes it easier to work with
|
||||
|
||||
local is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0
|
||||
if not is_ground then
|
||||
|
|
@ -717,9 +696,8 @@ local function spawn_check(pos, spawn_def)
|
|||
if pos.y >= spawn_def.min_height
|
||||
and pos.y <= spawn_def.max_height
|
||||
and spawn_def.dimension == dimension
|
||||
and biome_check(spawn_def.biomes, biome_name) then
|
||||
and biome_check(spawn_def.biomes, gotten_biome) then
|
||||
|
||||
mcl_log("Spawn level 1 check - Passed")
|
||||
if (is_ground or spawn_def.type_of_spawning ~= "ground")
|
||||
and (spawn_def.type_of_spawning ~= "ground" or not is_leaf)
|
||||
and (not is_farm_animal(spawn_def.name) or is_grass)
|
||||
|
|
@ -729,7 +707,6 @@ local function spawn_check(pos, spawn_def)
|
|||
and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil)
|
||||
and ( not spawn_protected or not minetest.is_protected(pos, "") ) then
|
||||
|
||||
mcl_log("Spawn level 2 check - Passed")
|
||||
local gotten_light = get_node_light(pos)
|
||||
|
||||
if modern_lighting then
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
local S = minetest.get_translator(minetest.get_current_modname())
|
||||
|
||||
local axolotl = {
|
||||
description = S("Axolotl"),
|
||||
type = "animal",
|
||||
spawn_class = "axolotl",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
|||
--###################
|
||||
|
||||
local cod = {
|
||||
description = S("Cod"),
|
||||
type = "animal",
|
||||
spawn_class = "water_ambient",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ mcl_mobs.register_mob("mobs_mc:creeper", {
|
|||
})
|
||||
|
||||
mcl_mobs.register_mob("mobs_mc:creeper_charged", {
|
||||
description = S("Charged Creeper"),
|
||||
description = S("Creeper"),
|
||||
type = "monster",
|
||||
spawn_class = "hostile",
|
||||
hp_min = 20,
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
|||
--###################
|
||||
|
||||
local dolphin = {
|
||||
description = S("Dolphin"),
|
||||
type = "animal",
|
||||
spawn_class = "water",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ mcl_mobs.register_mob("mobs_mc:ghast", {
|
|||
view_range = 64,
|
||||
attack_type = "dogshoot",
|
||||
arrow = "mobs_mc:fireball",
|
||||
shoot_interval = 5,
|
||||
shoot_offset = -0.5,
|
||||
shoot_interval = 3,
|
||||
shoot_offset = -5,
|
||||
dogshoot_switch = 1,
|
||||
dogshoot_count_max =1,
|
||||
passive = false,
|
||||
|
|
@ -109,7 +109,6 @@ mcl_mobs.register_arrow("mobs_mc:fireball", {
|
|||
textures = {"mcl_fire_fire_charge.png"},
|
||||
velocity = 5,
|
||||
collisionbox = {-.5, -.5, -.5, .5, .5, .5},
|
||||
_lifetime = 10,
|
||||
_is_fireball = true,
|
||||
|
||||
hit_player = function(self, player)
|
||||
|
|
@ -131,10 +130,6 @@ mcl_mobs.register_arrow("mobs_mc:fireball", {
|
|||
damage_groups = {fleshy = 6},
|
||||
}, nil)
|
||||
mcl_mobs.mob_class.boom(self,self.object:get_pos(), 1, true)
|
||||
local ent = mob:get_luaentity()
|
||||
if not ent or ent.health <= 0 then
|
||||
awards.unlock(self._puncher:get_player_name(), "mcl:fireball_redir_serv")
|
||||
end
|
||||
end,
|
||||
|
||||
hit_node = function(self, pos, node)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ for i=1,4 do
|
|||
end
|
||||
|
||||
mcl_mobs.register_mob("mobs_mc:glow_squid", {
|
||||
description = S("Glow Squid"),
|
||||
type = "animal",
|
||||
spawn_class = "water_underground",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -16,13 +16,6 @@ local trading_items = {
|
|||
{ itemstring = "mcl_throwing:ender_pearl", amount_min = 2, amount_max = 6 },
|
||||
{ itemstring = "mcl_potions:fire_resistance", amount_min = 1, amount_max = 1 },
|
||||
{ itemstring = "mcl_potions:fire_resistance_splash", amount_min = 1, amount_max = 1 },
|
||||
{ itemstring = "mcl_enchanting:book_enchanted", amount_min = 1, amount_max = 1 },
|
||||
{ itemstring = "mcl_armor:boots_iron_enchanted", amount_min = 1, amount_max = 1 },
|
||||
{ itemstring = "mcl_blackstone:blackstone", amount_min = 8, amount_max = 16 },
|
||||
{ itemstring = "mcl_bows:arrow", amount_min = 6, amount_max = 12 },
|
||||
{ itemstring = "mcl_core:crying_obsidian", amount_min = 1, amount_max = 1 },
|
||||
{ itemstring = "mcl_fire:fire_charge", amount_min = 1, amount_max = 1 },
|
||||
--{ itemstring = "FIXME:spectral_arrow", amount_min = 6, amount_max = 12 },
|
||||
}
|
||||
|
||||
local S = minetest.get_translator("mobs_mc")
|
||||
|
|
@ -149,18 +142,14 @@ local piglin = {
|
|||
local c_pos = self.object:get_pos()
|
||||
if c_pos then
|
||||
self.what_traded = trading_items[math.random(#trading_items)]
|
||||
local stack = ItemStack(self.what_traded.itemstring)
|
||||
stack:set_count(math.random(self.what_traded.amount_min, self.what_traded.amount_max))
|
||||
if mcl_enchanting.is_enchanted(self.what_traded.itemstring) then
|
||||
local enchantment = "soul_speed"
|
||||
mcl_enchanting.enchant(stack, enchantment, mcl_enchanting.random(nil, 1, mcl_enchanting.enchantments[enchantment].max_level))
|
||||
for x = 1, math.random(self.what_traded.amount_min, self.what_traded.amount_max) do
|
||||
local p = c_pos
|
||||
local nn=minetest.find_nodes_in_area_under_air(vector.offset(c_pos,-1,-1,-1),vector.offset(c_pos,1,1,1),{"group:solid"})
|
||||
if nn and #nn > 0 then
|
||||
p = vector.offset(nn[math.random(#nn)],0,1,0)
|
||||
end
|
||||
minetest.add_item(p, self.what_traded.itemstring)
|
||||
end
|
||||
local p = c_pos
|
||||
local nn=minetest.find_nodes_in_area_under_air(vector.offset(c_pos,-1,-1,-1),vector.offset(c_pos,1,1,1),{"group:solid"})
|
||||
if nn and #nn > 0 then
|
||||
p = vector.offset(nn[math.random(#nn)],0,1,0)
|
||||
end
|
||||
minetest.add_item(p, stack)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
@ -343,13 +332,8 @@ mcl_mobs.register_mob("mobs_mc:baby_zombified_piglin", baby_zombified_piglin)
|
|||
|
||||
-- Compatibility code. These were removed, and now are called zombie piglins. They don't spawn.
|
||||
-- This is only to catch old cases. Maybe could be an alias?
|
||||
local pigman_unused = table.copy(zombified_piglin)
|
||||
pigman_unused.unused = true
|
||||
local baby_pigman_unused = table.copy(baby_zombified_piglin)
|
||||
baby_pigman_unused.unused = true
|
||||
|
||||
mcl_mobs.register_mob("mobs_mc:pigman", pigman_unused)
|
||||
mcl_mobs.register_mob("mobs_mc:baby_pigman", baby_pigman_unused)
|
||||
mcl_mobs.register_mob("mobs_mc:pigman", zombified_piglin)
|
||||
mcl_mobs.register_mob("mobs_mc:baby_pigman", baby_zombified_piglin)
|
||||
|
||||
|
||||
-- Piglin Brute --
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
|||
--###################
|
||||
|
||||
local salmon = {
|
||||
description = S("Salmon"),
|
||||
type = "animal",
|
||||
spawn_class = "water_ambient",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -44,13 +44,6 @@ local skeleton = {
|
|||
"mcl_bows_bow_0.png", -- wielded_item
|
||||
}
|
||||
},
|
||||
-- TODO: change random to new api when min minetest version is 5.8
|
||||
sounds = {
|
||||
random = "mobs_mc_skeleton_random.2",
|
||||
death = "mobs_mc_skeleton_death",
|
||||
damage = "mobs_mc_skeleton_hurt",
|
||||
distance = 16,
|
||||
},
|
||||
walk_velocity = 1.2,
|
||||
run_velocity = 2.0,
|
||||
damage = 2,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ mcl_mobs.register_mob("mobs_mc:witherskeleton", {
|
|||
visual_size = {x=1.2, y=1.2},
|
||||
makes_footstep_sound = true,
|
||||
sounds = {
|
||||
random = "mobs_mc_skeleton_random.1",
|
||||
random = "mobs_mc_skeleton_random",
|
||||
death = "mobs_mc_skeleton_death",
|
||||
damage = "mobs_mc_skeleton_hurt",
|
||||
distance = 16,
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ end
|
|||
|
||||
-- Slime
|
||||
local slime_big = {
|
||||
description = S("Slime - big"),
|
||||
description = S("Slime"),
|
||||
type = "monster",
|
||||
spawn_class = "hostile",
|
||||
group_attack = { "mobs_mc:slime_big", "mobs_mc:slime_small", "mobs_mc:slime_tiny" },
|
||||
|
|
@ -231,7 +231,6 @@ local slime_big = {
|
|||
mcl_mobs.register_mob("mobs_mc:slime_big", slime_big)
|
||||
|
||||
local slime_small = table.copy(slime_big)
|
||||
slime_small.description = S("Slime - small")
|
||||
slime_small.sounds.base_pitch = 1.15
|
||||
slime_small.hp_min = 4
|
||||
slime_small.hp_max = 4
|
||||
|
|
@ -249,7 +248,6 @@ slime_small.on_die = spawn_children_on_die("mobs_mc:slime_tiny", 0.6, 1.0)
|
|||
mcl_mobs.register_mob("mobs_mc:slime_small", slime_small)
|
||||
|
||||
local slime_tiny = table.copy(slime_big)
|
||||
slime_tiny.description = S("Slime - tiny")
|
||||
slime_tiny.sounds.base_pitch = 1.3
|
||||
slime_tiny.hp_min = 1
|
||||
slime_tiny.hp_max = 1
|
||||
|
|
@ -399,7 +397,7 @@ swamp_max)
|
|||
|
||||
-- Magma cube
|
||||
local magma_cube_big = {
|
||||
description = S("Magma Cube - big"),
|
||||
description = S("Magma Cube"),
|
||||
type = "monster",
|
||||
spawn_class = "hostile",
|
||||
hp_min = 16,
|
||||
|
|
@ -460,7 +458,6 @@ local magma_cube_big = {
|
|||
mcl_mobs.register_mob("mobs_mc:magma_cube_big", magma_cube_big)
|
||||
|
||||
local magma_cube_small = table.copy(magma_cube_big)
|
||||
magma_cube_small.description = S("Magma Cube - small")
|
||||
magma_cube_small.sounds.jump = "mobs_mc_magma_cube_small"
|
||||
magma_cube_small.sounds.death = "mobs_mc_magma_cube_small"
|
||||
magma_cube_small.hp_min = 4
|
||||
|
|
@ -482,7 +479,6 @@ magma_cube_small.on_die = spawn_children_on_die("mobs_mc:magma_cube_tiny", 0.6,
|
|||
mcl_mobs.register_mob("mobs_mc:magma_cube_small", magma_cube_small)
|
||||
|
||||
local magma_cube_tiny = table.copy(magma_cube_big)
|
||||
magma_cube_tiny.description = S("Magma Cube - tiny")
|
||||
magma_cube_tiny.sounds.jump = "mobs_mc_magma_cube_small"
|
||||
magma_cube_tiny.sounds.death = "mobs_mc_magma_cube_small"
|
||||
magma_cube_tiny.sounds.base_pitch = 1.25
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ local S = minetest.get_translator("mobs_mc")
|
|||
|
||||
|
||||
local strider = {
|
||||
description = S("Strider"),
|
||||
type = "animal",
|
||||
passive = true,
|
||||
spawn_class = "passive",
|
||||
|
|
@ -31,8 +30,6 @@ local strider = {
|
|||
} },
|
||||
visual_size = {x=3, y=3},
|
||||
sounds = {
|
||||
eat = "mobs_mc_animal_eat_generic",
|
||||
distance = 16,
|
||||
},
|
||||
jump = true,
|
||||
makes_footstep_sound = true,
|
||||
|
|
@ -54,7 +51,6 @@ local strider = {
|
|||
walk_start = 1,
|
||||
walk_end = 20,
|
||||
},
|
||||
follow = { "mcl_crimson:warped_fungus" },
|
||||
lava_damage = 0,
|
||||
fire_damage = 0,
|
||||
light_damage = 0,
|
||||
|
|
@ -71,13 +67,8 @@ local strider = {
|
|||
do_custom = function(self, dtime)
|
||||
|
||||
if minetest.find_node_near(self.object:get_pos(), 2, {"mcl_core:lava_source","mcl_core:lava_flowing","mcl_nether:nether_lava_source","mcl_nether:nether_lava_flowing"}) then
|
||||
if self.driver then
|
||||
self.walk_velocity = 4
|
||||
self.run_velocity = 8
|
||||
else
|
||||
self.walk_velocity = 2
|
||||
self.run_velocity = 4
|
||||
end
|
||||
self.walk_velocity = 2
|
||||
self.run_velocity = 4
|
||||
self.base_texture[1] = "extra_mobs_strider.png"
|
||||
self.shaking = false
|
||||
else
|
||||
|
|
@ -131,7 +122,7 @@ local strider = {
|
|||
|
||||
local wielditem = clicker:get_wielded_item()
|
||||
|
||||
if wielditem:get_name() == "mcl_crimson:warped_fungus" then
|
||||
if wielditem:get_name() ~= "mcl_crimson:warped_fungus" then
|
||||
if self:feed_tame(clicker, 1, true, true) then return end
|
||||
end
|
||||
|
||||
|
|
@ -206,7 +197,6 @@ mcl_mobs.register_mob("mobs_mc:strider", strider)
|
|||
-- Baby strider.
|
||||
|
||||
local baby_strider = table.copy(strider)
|
||||
baby_strider.description = S("Baby Strider")
|
||||
baby_strider.collisionbox = {-.3, -0.01, -.3, .3, 0.94, .3}
|
||||
baby_strider.xp_min = 13
|
||||
baby_strider.xp_max = 13
|
||||
|
|
@ -216,7 +206,7 @@ textures = { {
|
|||
} }
|
||||
baby_strider.walk_velocity = 1.2
|
||||
baby_strider.run_velocity = 2.4
|
||||
baby_strider.child = true
|
||||
baby_strider.child = 1
|
||||
|
||||
mcl_mobs.register_mob("mobs_mc:baby_strider", baby_strider)
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ local function set_textures(self)
|
|||
end
|
||||
|
||||
local tropical_fish = {
|
||||
description = S("Tropical Fish"),
|
||||
type = "animal",
|
||||
spawn_class = "water_ambient",
|
||||
can_despawn = true,
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull", {
|
|||
},
|
||||
velocity = 7,
|
||||
rotate = 90,
|
||||
_lifetime = 15,
|
||||
_lifetime = 350,
|
||||
on_punch = function(self) end,
|
||||
|
||||
-- direct hit
|
||||
|
|
@ -516,7 +516,7 @@ mcl_mobs.register_arrow("mobs_mc:wither_skull_strong", {
|
|||
},
|
||||
velocity = 4,
|
||||
rotate = 90,
|
||||
_lifetime = 25,
|
||||
_lifetime = 500,
|
||||
on_punch = function(self) end,
|
||||
|
||||
-- direct hit
|
||||
|
|
|
|||
|
|
@ -135,7 +135,6 @@ end
|
|||
|
||||
-- Tamed wolf (aka “dog”)
|
||||
local dog = table.copy(wolf)
|
||||
dog.description = S("Dog")
|
||||
dog.can_despawn = false
|
||||
dog.passive = true
|
||||
dog.hp_min = 20
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ doc.data = {}
|
|||
doc.data.categories = {}
|
||||
doc.data.aliases = {}
|
||||
-- Default order (includes categories of other mods from the Docuentation System modpack)
|
||||
doc.data.category_order = {"basics", "nodes", "tools", "craftitems", "advanced", "mobs"}
|
||||
doc.data.category_order = {"basics", "nodes", "tools", "craftitems", "advanced"}
|
||||
doc.data.category_count = 0
|
||||
doc.data.players = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -116,11 +116,7 @@ function doc_identifier.identify(itemstack, user, pointed_thing)
|
|||
end
|
||||
-- A known registered object
|
||||
elseif ro then
|
||||
if doc.entry_exists("mobs", le.name) then
|
||||
doc.show_entry(username, "mobs", le.name, true)
|
||||
else
|
||||
doc.show_entry(username, ro.category, ro.entry, true)
|
||||
end
|
||||
doc.show_entry(username, ro.category, ro.entry, true)
|
||||
-- Undefined object (error)
|
||||
elseif minetest.registered_entities[le.name] == nil then
|
||||
show_message(username, "error_unknown", le.name)
|
||||
|
|
|
|||
|
|
@ -1136,86 +1136,6 @@ doc.add_category("craftitems", {
|
|||
end
|
||||
})
|
||||
|
||||
doc.add_category("mobs", {
|
||||
name = S("Mobs"),
|
||||
description = S("different mobs"),
|
||||
build_formspec = function(data, playername)
|
||||
if data then
|
||||
local datastring = ""
|
||||
|
||||
if data.description then
|
||||
datastring = datastring .. S("Description: @1", data.description)
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
if data.type then
|
||||
datastring = datastring .. S("Type: @1", data.type)
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
if data.spawn_class then
|
||||
datastring = datastring .. S("spawn class: @1", data.spawn_class)
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
if data.jump then
|
||||
datastring = datastring .. S("Can Jump")
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
if data.fly then
|
||||
datastring = datastring .. S("Can Fly")
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
if data.drops then
|
||||
count = 0
|
||||
for _,item in ipairs(data.drops) do
|
||||
count = count + 1
|
||||
end
|
||||
|
||||
if count > 0 then
|
||||
datastring = datastring .. S("drops: ")
|
||||
datastring = newline(datastring)
|
||||
|
||||
for _,item in ipairs(data.drops) do
|
||||
local itemDescription = ItemStack(item.name):get_short_description()
|
||||
datastring = datastring .. itemDescription
|
||||
datastring = newline(datastring)
|
||||
end
|
||||
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
end
|
||||
|
||||
if data.follow then
|
||||
datastring = datastring .. S("follows player when these items are held:")
|
||||
datastring = newline(datastring)
|
||||
|
||||
if type(data.follow) == "string" then
|
||||
datastring = datastring .. data.follow
|
||||
datastring = newline(datastring)
|
||||
else
|
||||
for i=1, #data.follow do
|
||||
local itemstring = data.follow[i]
|
||||
local itemDescription = ItemStack(itemstring):get_short_description()
|
||||
datastring = datastring .. itemDescription
|
||||
datastring = newline(datastring)
|
||||
end
|
||||
end
|
||||
|
||||
datastring = newline2(datastring)
|
||||
end
|
||||
|
||||
local formstring = doc.widgets.text(datastring, nil, nil, doc.FORMSPEC.ENTRY_WIDTH - 1.2)
|
||||
|
||||
return formstring
|
||||
else
|
||||
return "label[0,1;NO DATA AVALIABLE!]"
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
-- Register group definition stuff
|
||||
-- More (user-)friendly group names to replace the rather technical names
|
||||
-- for better understanding
|
||||
|
|
|
|||
|
|
@ -447,8 +447,8 @@ The values for X, Y and Z work like this:=Les valeurs pour X, Y et Z fonctionnen
|
|||
You can view your current position in the debug screen (open with [F5]).=Vous pouvez afficher votre position actuelle dans l'écran de débogage (ouvrir avec [F5]).
|
||||
|
||||
# MCL2 extensions
|
||||
Creative Mode=Mode créatif
|
||||
Enabling Creative Mode in MineClone 2 applies the following changes:=L'activation du mode créatif dans MineClone 2 applique les modifications suivantes :
|
||||
Creative Mode=Mode Creatif
|
||||
Enabling Creative Mode in MineClone 2 applies the following changes:=L'activation du mode créatif dans MineClone 2 applique les modifications suivantes:
|
||||
• You keep the things you've placed=• Vous gardez les choses que vous avez placées
|
||||
• Creative inventory is available to obtain most items easily=• Un inventaire créatif est disponible pour obtenir facilement la plupart des objets
|
||||
• Hand breaks all default blocks instantly=• La main brise instantanément tous les blocs par défaut
|
||||
|
|
|
|||
|
|
@ -550,13 +550,6 @@ awards.register_achievement("mcl:obsidian", {
|
|||
type = "Advancement",
|
||||
group = "Overworld",
|
||||
})
|
||||
awards.register_achievement("mcl:fireball_redir_serv", {
|
||||
title = S("Fireball Redirection Service"),
|
||||
description = S("Defeat a ghast with his own weapon."),
|
||||
icon = "mcl_fire_fire_charge.png",
|
||||
type = "Advancement",
|
||||
group = "Nether",
|
||||
})
|
||||
|
||||
awards.register_achievement("mcl:hero_of_the_village", {
|
||||
title = S("Hero of the Village"),
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Eat a cooked porkchop.=Mangez du porc cuit.
|
|||
Eat a cooked rabbit.=Mangez du lapin cuit.
|
||||
Get really desperate and eat rotten flesh.=Soyez vraiment désespéré et mangez de la chair pourrie.
|
||||
Getting Wood=Obtenir du bois
|
||||
Getting an Upgrade=Obtenir une amélioration
|
||||
Getting an Upgrade=Obtenir une augmentation de niveau
|
||||
Hit a skeleton, wither skeleton or stray by bow and arrow from a distance of at least 20 meters.=Frappez un squelette, wither squelette ou stray à l'arc et à la flèche à une distance d'au moins 20 mètres.
|
||||
Hot Topic=Sujet brûlant
|
||||
Into Fire=Dans le feu
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ minetest.register_entity("mcl_experience:orb", {
|
|||
delete_timer = 0,
|
||||
radius = 4,
|
||||
|
||||
|
||||
on_activate = function(self, staticdata, dtime_s)
|
||||
self.object:set_velocity(vector.new(
|
||||
math.random(-2,2)*math.random(),
|
||||
|
|
@ -186,14 +187,10 @@ minetest.register_entity("mcl_experience:orb", {
|
|||
self.object:set_armor_groups({immortal = 1})
|
||||
self.object:set_velocity({x = 0, y = 2, z = 0})
|
||||
self.object:set_acceleration(gravity)
|
||||
|
||||
-- Assign 0 xp in case the entity was persisted even though it should not have been (static_save = false)
|
||||
-- This was a minetest bug for a while: https://github.com/minetest/minetest/issues/14420
|
||||
local xp = tonumber(staticdata) or 0
|
||||
local xp = tonumber(staticdata)
|
||||
self._xp = xp
|
||||
size = xp_to_size(xp)
|
||||
|
||||
self.object:set_properties({
|
||||
size = xp_to_size(xp)
|
||||
self.object:set_properties({
|
||||
visual_size = {x = size, y = size},
|
||||
glow = 14,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -103,10 +103,10 @@ local function get_armor_texture(textures, name, modname, itemname, itemstring)
|
|||
end
|
||||
|
||||
if overlay == "" then return core_armor_texture end -- key not present; armor not trimmed
|
||||
|
||||
|
||||
return core_armor_texture .. overlay
|
||||
end
|
||||
|
||||
|
||||
return func
|
||||
end
|
||||
|
||||
|
|
@ -129,7 +129,6 @@ function mcl_armor.register_set(def)
|
|||
local groups = table.copy(groups)
|
||||
groups["armor_" .. name] = 1
|
||||
groups["combat_armor_" .. name] = 1
|
||||
groups["armor_" .. def.name] = 1
|
||||
groups.armor = 1
|
||||
groups.combat_armor = 1
|
||||
groups.mcl_armor_points = def.points[name]
|
||||
|
|
@ -327,12 +326,12 @@ end
|
|||
tt.register_snippet(function(itemstring, toolcaps, stack)
|
||||
if not stack then return nil end
|
||||
local meta = stack:get_meta()
|
||||
if not mcl_armor.is_trimmed(stack) then return nil end
|
||||
if not mcl_armor.is_trimmed(stack) then return nil end
|
||||
-- we need to get the part of the overlay image between the overlay begin ( and the trim name end _
|
||||
-- we COULD easily store this info in meta, but that would bloat the meta storage, as the same few values would be stored over and over again on every trimmed item
|
||||
-- this is fine here as this code gets only executed when you put armor and a trim in a smithing table
|
||||
local full_overlay = meta:get_string("mcl_armor:trim_overlay")
|
||||
local trim_name = full_overlay:match("%((.-)%_")
|
||||
local trim_name = full_overlay:match("%((.-)%_")
|
||||
return "Upgrade:\n " .. trim_name:gsub("^%l", string.upper) .. " Armor Trim"
|
||||
end)
|
||||
|
||||
|
|
@ -340,4 +339,4 @@ function mcl_armor.is_trimmed(itemstack)
|
|||
-- this meta value will be there for every trimmed armor piece
|
||||
-- remember, get_string returns "" if the key doesn't exist
|
||||
return itemstack:get_meta():get_string("mcl_armor:trim_overlay") ~= ""
|
||||
end
|
||||
end
|
||||
|
|
@ -71,6 +71,5 @@ dofile(modpath .. "/api.lua")
|
|||
dofile(modpath .. "/player.lua")
|
||||
dofile(modpath .. "/damage.lua")
|
||||
dofile(modpath .. "/register.lua")
|
||||
dofile(modpath .. "/leather.lua")
|
||||
dofile(modpath .. "/alias.lua")
|
||||
dofile(modpath .. "/trims.lua")
|
||||
|
|
|
|||
|
|
@ -1,207 +0,0 @@
|
|||
local C = minetest.colorize
|
||||
|
||||
local colors = {
|
||||
-- { ID, decription, wool, dye }
|
||||
{ "red", "Red", "mcl_dye:red", "#951d1d" },
|
||||
{ "blue", "Blue", "mcl_dye:blue", "#2a2c94" },
|
||||
{ "cyan", "Cyan", "mcl_dye:cyan", "#0d7d8e" },
|
||||
{ "grey", "Grey", "mcl_dye:dark_grey", "#363a3f" },
|
||||
{ "silver", "Light Grey", "mcl_dye:grey", "#818177" },
|
||||
{ "black", "Black", "mcl_dye:black", "#020307" },
|
||||
{ "yellow", "Yellow", "mcl_dye:yellow", "#f2b410" },
|
||||
{ "green", "Green", "mcl_dye:dark_green", "#495d20" },
|
||||
{ "magenta", "Magenta", "mcl_dye:magenta", "#ae2ea4" },
|
||||
{ "orange", "Orange", "mcl_dye:orange", "#e36501" },
|
||||
{ "purple", "Purple", "mcl_dye:violet", "#681ba1" },
|
||||
{ "brown", "Brown", "mcl_dye:brown", "#623b1a" },
|
||||
{ "pink", "Pink", "mcl_dye:pink", "#d66691" },
|
||||
{ "lime", "Lime", "mcl_dye:green", "#60ad13" },
|
||||
{ "light_blue", "Light Blue", "mcl_dye:lightblue", "#1f8eca" },
|
||||
{ "white", "White", "mcl_dye:white", "#d1d7d8" },
|
||||
}
|
||||
|
||||
local function color_string_to_table(colorstring)
|
||||
return {
|
||||
r = tonumber(colorstring:sub(2,3), 16), -- 16 as second parameter allows hexadecimal
|
||||
g = tonumber(colorstring:sub(4,5), 16),
|
||||
b = tonumber(colorstring:sub(6,7), 16),
|
||||
}
|
||||
end
|
||||
|
||||
local function av(a, b)
|
||||
return (a + b)/2
|
||||
end
|
||||
|
||||
local function calculate_color(first, last)
|
||||
return {
|
||||
r = av(first.r, last.r),
|
||||
g = av(first.g, last.g),
|
||||
b = av(first.b, last.b),
|
||||
}
|
||||
end
|
||||
|
||||
local function get_texture_function(texture)
|
||||
local function get_texture(_, itemstack)
|
||||
local out
|
||||
local color = itemstack:get_meta():get_string("mcl_armor:color")
|
||||
if color == "" or color == nil then
|
||||
out = texture
|
||||
else
|
||||
out = texture.."^[hsl:0:100:50^[multiply:"..color
|
||||
end
|
||||
|
||||
if mcl_enchanting.is_enchanted(itemstack:get_name()) then
|
||||
return out..mcl_enchanting.overlay
|
||||
else
|
||||
return out
|
||||
end
|
||||
end
|
||||
return get_texture
|
||||
end
|
||||
|
||||
function mcl_armor.colorize_leather_armor(itemstack, colorstring)
|
||||
if not itemstack or minetest.get_item_group(itemstack:get_name(), "armor_leather") == 0 then
|
||||
return
|
||||
end
|
||||
local color = color_string_to_table(colorstring)
|
||||
colorstring = minetest.colorspec_to_colorstring(color)
|
||||
local meta = itemstack:get_meta()
|
||||
local old_color = meta:get_string("mcl_armor:color")
|
||||
if old_color == colorstring then return
|
||||
elseif old_color ~= "" then
|
||||
color = calculate_color(
|
||||
color_string_to_table(minetest.colorspec_to_colorstring(old_color)),
|
||||
color
|
||||
)
|
||||
colorstring = minetest.colorspec_to_colorstring(color)
|
||||
end
|
||||
meta:set_string("mcl_armor:color", colorstring)
|
||||
meta:set_string("inventory_image",
|
||||
itemstack:get_definition().inventory_image .. "^[hsl:0:100:50^[multiply:" .. colorstring
|
||||
)
|
||||
tt.reload_itemstack_description(itemstack)
|
||||
return itemstack
|
||||
end
|
||||
|
||||
function mcl_armor.wash_leather_armor(itemstack)
|
||||
if not itemstack or minetest.get_item_group(itemstack:get_name(), "armor_leather") == 0 then
|
||||
return
|
||||
end
|
||||
local meta = itemstack:get_meta()
|
||||
meta:set_string("mcl_armor:color", "")
|
||||
meta:set_string("inventory_image", "")
|
||||
tt.reload_itemstack_description(itemstack)
|
||||
return itemstack
|
||||
end
|
||||
|
||||
mcl_armor.register_set({
|
||||
name = "leather",
|
||||
description = "Leather",
|
||||
descriptions = {
|
||||
head = "Cap",
|
||||
torso = "Tunic",
|
||||
legs = "Pants",
|
||||
},
|
||||
durability = 80,
|
||||
enchantability = 15,
|
||||
points = {
|
||||
head = 1,
|
||||
torso = 3,
|
||||
legs = 2,
|
||||
feet = 1,
|
||||
},
|
||||
textures = {
|
||||
head = get_texture_function("mcl_armor_helmet_leather.png"),
|
||||
torso = get_texture_function("mcl_armor_chestplate_leather.png"),
|
||||
legs = get_texture_function("mcl_armor_leggings_leather.png"),
|
||||
feet = get_texture_function("mcl_armor_boots_leather.png"),
|
||||
},
|
||||
craft_material = "mcl_mobitems:leather",
|
||||
})
|
||||
|
||||
tt.register_priority_snippet(function(_, _, itemstack)
|
||||
if not itemstack or minetest.get_item_group(itemstack:get_name(), "armor_leather") == 0 then
|
||||
return
|
||||
end
|
||||
local color = itemstack:get_meta():get_string("mcl_armor:color")
|
||||
if color and color ~= "" then
|
||||
local text = C(mcl_colors.GRAY, "Dyed: "..color)
|
||||
return text, false
|
||||
end
|
||||
end)
|
||||
|
||||
for name, element in pairs(mcl_armor.elements) do
|
||||
local modname = minetest.get_current_modname()
|
||||
local itemname = modname .. ":" .. element.name .. "_leather"
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = itemname,
|
||||
recipe = {
|
||||
itemname,
|
||||
"group:dye",
|
||||
},
|
||||
})
|
||||
local ench_itemname = itemname .. "_enchanted"
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = ench_itemname,
|
||||
recipe = {
|
||||
ench_itemname,
|
||||
"group:dye",
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
local function colorizing_crafting(itemstack, player, old_craft_grid, craft_inv)
|
||||
if minetest.get_item_group(itemstack:get_name(), "armor_leather") == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local found_la = nil
|
||||
local dye_color = nil
|
||||
for _, item in pairs(old_craft_grid) do
|
||||
local name = item:get_name()
|
||||
if name == "" then
|
||||
-- continue
|
||||
elseif minetest.get_item_group(name, "armor_leather") > 0 then
|
||||
if found_la then return end
|
||||
found_la = item
|
||||
elseif minetest.get_item_group(name, "dye") > 0 then
|
||||
if dye_color then return end
|
||||
for _, row in pairs(colors) do
|
||||
if row[3] == name then dye_color = row[4] end
|
||||
end
|
||||
else return end
|
||||
end
|
||||
|
||||
return mcl_armor.colorize_leather_armor(found_la, dye_color) or ItemStack()
|
||||
end
|
||||
|
||||
minetest.register_craft_predict(colorizing_crafting)
|
||||
minetest.register_on_craft(colorizing_crafting)
|
||||
|
||||
|
||||
minetest.register_chatcommand("color_leather", {
|
||||
params = "<color>",
|
||||
description = "Colorize a piece of leather armor, or wash it",
|
||||
privs = {debug = true},
|
||||
func = function(name, param)
|
||||
local player = minetest.get_player_by_name(name)
|
||||
if player then
|
||||
local item = player:get_wielded_item()
|
||||
if not item or minetest.get_item_group(item:get_name(), "armor_leather") == 0 then
|
||||
return false, "Not leather armor."
|
||||
end
|
||||
if param == "wash" then
|
||||
player:set_wielded_item(mcl_armor.wash_leather_armor(item))
|
||||
return true, "Washed."
|
||||
end
|
||||
local colorstring = minetest.colorspec_to_colorstring(param)
|
||||
if not colorstring then return false, "Invalid color" end
|
||||
player:set_wielded_item(mcl_armor.colorize_leather_armor(item, colorstring))
|
||||
return true, "Done: " .. colorstring
|
||||
else
|
||||
return false, "Player isn't online"
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
name = mcl_armor
|
||||
author = stu
|
||||
description = Adds craftable armor that is visible to other players.
|
||||
depends = mcl_core, mcl_player, mcl_enchanting, mcl_damage, mcl_colors, mcl_grindstone
|
||||
depends = mcl_core, mcl_player, mcl_enchanting, mcl_damage, mcl_grindstone
|
||||
optional_depends = mcl_fire, ethereal, bakedclay
|
||||
|
|
|
|||
|
|
@ -1,5 +1,24 @@
|
|||
local S = minetest.get_translator(minetest.get_current_modname())
|
||||
|
||||
mcl_armor.register_set({
|
||||
name = "leather",
|
||||
description = "Leather",
|
||||
descriptions = {
|
||||
head = "Cap",
|
||||
torso = "Tunic",
|
||||
legs = "Pants",
|
||||
},
|
||||
durability = 80,
|
||||
enchantability = 15,
|
||||
points = {
|
||||
head = 1,
|
||||
torso = 3,
|
||||
legs = 2,
|
||||
feet = 1,
|
||||
},
|
||||
craft_material = "mcl_mobitems:leather",
|
||||
})
|
||||
|
||||
mcl_armor.register_set({
|
||||
name = "gold",
|
||||
description = "Golden",
|
||||
|
|
|
|||
|
|
@ -316,15 +316,10 @@ minetest.register_node(SCAFFOLDING_NAME, {
|
|||
-- A quick check, that may or may not work, to attempt to prevent placing things on the side of other nodes.
|
||||
local dir = vector.subtract(pointed.under, pointed.above)
|
||||
local wdir = minetest.dir_to_wallmounted(dir)
|
||||
local anode = minetest.get_node(pointed.above).name
|
||||
if wdir == 1 then
|
||||
if (anode == "air" or minetest.registered_nodes[anode].buildable_to) and not mcl_bamboo.is_protected(pointed.above, placer) then
|
||||
minetest.set_node(pointed.above, { name = SCAFFOLDING_NAME, param2 = 0 })
|
||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||
itemstack:take_item(1)
|
||||
end
|
||||
else
|
||||
return
|
||||
minetest.set_node(pointed.above, { name = SCAFFOLDING_NAME, param2 = 0 })
|
||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||
itemstack:take_item(1)
|
||||
end
|
||||
return itemstack
|
||||
else
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ local function damage_explosion(self, damagemulitplier)
|
|||
for _,obj in pairs(objects) do
|
||||
if obj:is_player() then
|
||||
mcl_util.deal_damage(obj, damagemulitplier - vector.distance(p, obj:get_pos()), {type = "explosion"})
|
||||
elseif obj:get_luaentity() and obj:get_luaentity().is_mob then
|
||||
elseif obj:get_luaentity().is_mob then
|
||||
obj:punch(self.object, 1.0, {
|
||||
full_punch_interval=1.0,
|
||||
damage_groups={fleshy=damagemulitplier - vector.distance(p, obj:get_pos())},
|
||||
}, self.object:get_velocity()) -- TODO possibly change the punch dir to be outwards instead of rocket velocity
|
||||
}, self.object:get_velocity())
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -94,14 +94,6 @@ local function register_filled_cauldron(water_level, description, liquid)
|
|||
drop = "mcl_cauldrons:cauldron",
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 2,
|
||||
on_rightclick = function(pos, node, player, itemstack)
|
||||
local outcome = mcl_armor.wash_leather_armor(itemstack)
|
||||
if outcome then
|
||||
minetest.sound_play("mcl_potions_bottle_pour",
|
||||
{pos=pos, gain=0.5, max_hear_range=16},true)
|
||||
end
|
||||
return outcome
|
||||
end,
|
||||
})
|
||||
|
||||
-- Add entry aliases for the Help
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
local planks = "mcl_cherry_blossom:cherrywood"
|
||||
local logs = "mcl_cherry_blossom:cherrytree"
|
||||
local stripped_logs = "mcl_cherry_blossom:stripped_cherrytree"
|
||||
local wood = "mcl_cherry_blossom:cherrytree_bark"
|
||||
local stripped_wood = "mcl_cherry_blossom:stripped_cherrytree_bark"
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_cherry_blossom:cherrytree_bark 3",
|
||||
|
|
@ -28,27 +26,6 @@ minetest.register_craft({
|
|||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_cherry_blossom:cherrywood 4",
|
||||
recipe = {
|
||||
{ wood },
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_cherry_blossom:cherrywood 4",
|
||||
recipe = {
|
||||
{ stripped_logs },
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_cherry_blossom:cherrywood 4",
|
||||
recipe = {
|
||||
{ stripped_wood },
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_cherry_blossom:cherry_door 3",
|
||||
recipe = {
|
||||
|
|
|
|||
|
|
@ -4,28 +4,27 @@ local doc_mod = minetest.get_modpath("doc")
|
|||
local block = {}
|
||||
|
||||
block.dyes = {
|
||||
{"white", S("White Terracotta"), S("White Glazed Terracotta"), S("White Glazed Terracotta Pillar"), S("White Concrete Powder"), S("White Concrete"), "white"},
|
||||
{"grey", S("Grey Terracotta"), S("Grey Glazed Terracotta"), S("Grey Glazed Terracotta Pillar"), S("Grey Concrete Powder"), S("Grey Concrete"), "dark_grey"},
|
||||
{"silver", S("Light Grey Terracotta"), S("Light Grey Glazed Terracotta"), S("Light Grey Glazed Terracotta Pillar"), S("Light Grey Concrete Powder"), S("Light Grey Concrete"), "grey"},
|
||||
{"black", S("Black Terracotta"), S("Black Glazed Terracotta"), S("Black Glazed Terracotta Pillar"), S("Black Concrete Powder"), S("Black Concrete"), "black"},
|
||||
{"red", S("Red Terracotta"), S("Red Glazed Terracotta"), S("Red Glazed Terracotta Pillar"), S("Red Concrete Powder"), S("Red Concrete"), "red"},
|
||||
{"yellow", S("Yellow Terracotta"), S("Yellow Glazed Terracotta"), S("Yellow Glazed Terracotta Pillar"), S("Yellow Concrete Powder"), S("Yellow Concrete"), "yellow"},
|
||||
{"green", S("Green Terracotta"), S("Green Glazed Terracotta"), S("Green Glazed Terracotta Pillar"), S("Green Concrete Powder"), S("Green Concrete"), "dark_green"},
|
||||
{"cyan", S("Cyan Terracotta"), S("Cyan Glazed Terracotta"), S("Cyan Glazed Terracotta Pillar"), S("Cyan Concrete Powder"), S("Cyan Concrete"), "cyan"},
|
||||
{"blue", S("Blue Terracotta"), S("Blue Glazed Terracotta"), S("Blue Glazed Terracotta Pillar"), S("Blue Concrete Powder"), S("Blue Concrete"), "blue"},
|
||||
{"magenta", S("Magenta Terracotta"), S("Magenta Glazed Terracotta"), S("Magenta Glazed Terracotta Pillar"), S("Magenta Concrete Powder"), S("Magenta Concrete"), "magenta"},
|
||||
{"orange", S("Orange Terracotta"), S("Orange Glazed Terracotta"), S("Orange Glazed Terracotta Pillar"), S("Orange Concrete Powder"), S("Orange Concrete"), "orange"},
|
||||
{"purple", S("Purple Terracotta"), S("Purple Glazed Terracotta"), S("Purple Glazed Terracotta Pillar"), S("Purple Concrete Powder"), S("Purple Concrete"), "violet"},
|
||||
{"brown", S("Brown Terracotta"), S("Brown Glazed Terracotta"), S("Brown Glazed Terracotta Pillar"), S("Brown Concrete Powder"), S("Brown Concrete"), "brown"},
|
||||
{"pink", S("Pink Terracotta"), S("Pink Glazed Terracotta"), S("Pink Glazed Terracotta Pillar"), S("Pink Concrete Powder"), S("Pink Concrete"), "pink"},
|
||||
{"lime", S("Lime Terracotta"), S("Lime Glazed Terracotta"), S("Lime Glazed Terracotta Pillar"), S("Lime Concrete Powder"), S("Lime Concrete"), "green"},
|
||||
{"light_blue", S("Light Blue Terracotta"), S("Light Blue Glazed Terracotta"), S("Light Blue Glazed Terracotta Pillar"), S("Light Blue Concrete Powder"), S("Light Blue Concrete"), "lightblue"},
|
||||
{"white", S("White Terracotta"), S("White Glazed Terracotta"), S("White Concrete Powder"), S("White Concrete"), "white"},
|
||||
{"grey", S("Grey Terracotta"), S("Grey Glazed Terracotta"), S("Grey Concrete Powder"), S("Grey Concrete"), "dark_grey"},
|
||||
{"silver", S("Light Grey Terracotta"), S("Light Grey Glazed Terracotta"), S("Light Grey Concrete Powder"), S("Light Grey Concrete"), "grey"},
|
||||
{"black", S("Black Terracotta"), S("Black Glazed Terracotta"), S("Black Concrete Powder"), S("Black Concrete"), "black"},
|
||||
{"red", S("Red Terracotta"), S("Red Glazed Terracotta"), S("Red Concrete Powder"), S("Red Concrete"), "red"},
|
||||
{"yellow", S("Yellow Terracotta"), S("Yellow Glazed Terracotta"), S("Yellow Concrete Powder"), S("Yellow Concrete"), "yellow"},
|
||||
{"green", S("Green Terracotta"), S("Green Glazed Terracotta"), S("Green Concrete Powder"), S("Green Concrete"), "dark_green"},
|
||||
{"cyan", S("Cyan Terracotta"), S("Cyan Glazed Terracotta"), S("Cyan Concrete Powder"), S("Cyan Concrete"), "cyan"},
|
||||
{"blue", S("Blue Terracotta"), S("Blue Glazed Terracotta"), S("Blue Concrete Powder"), S("Blue Concrete"), "blue"},
|
||||
{"magenta", S("Magenta Terracotta"), S("Magenta Glazed Terracotta"), S("Magenta Concrete Powder"), S("Magenta Concrete"), "magenta"},
|
||||
{"orange", S("Orange Terracotta"), S("Orange Glazed Terracotta"), S("Orange Concrete Powder"), S("Orange Concrete"), "orange"},
|
||||
{"purple", S("Purple Terracotta"), S("Purple Glazed Terracotta"), S("Purple Concrete Powder"), S("Purple Concrete"), "violet"},
|
||||
{"brown", S("Brown Terracotta"), S("Brown Glazed Terracotta"), S("Brown Concrete Powder"), S("Brown Concrete"), "brown"},
|
||||
{"pink", S("Pink Terracotta"), S("Pink Glazed Terracotta"), S("Pink Concrete Powder"), S("Pink Concrete"), "pink"},
|
||||
{"lime", S("Lime Terracotta"), S("Lime Glazed Terracotta"), S("Lime Concrete Powder"), S("Lime Concrete"), "green"},
|
||||
{"light_blue", S("Light Blue Terracotta"), S("Light Blue Glazed Terracotta"), S("Light Blue Concrete Powder"), S("Light Blue Concrete"), "lightblue"},
|
||||
}
|
||||
local canonical_color = "yellow"
|
||||
|
||||
local hc_desc = S("Terracotta is a basic building material. It comes in many different colors.")
|
||||
local gt_desc = S("Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.")
|
||||
local gtp_desc = S("Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.")
|
||||
local cp_desc = S("Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.")
|
||||
local c_desc = S("Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.")
|
||||
local cp_tt = S("Turns into concrete on water contact")
|
||||
|
|
@ -58,28 +57,25 @@ for _, row in ipairs(block.dyes) do
|
|||
local is_canonical = name == canonical_color
|
||||
local sdesc_hc = row[2]
|
||||
local sdesc_gt = row[3]
|
||||
local sdesc_gtp = row[4]
|
||||
local sdesc_cp = row[5]
|
||||
local sdesc_c = row[6]
|
||||
local ldesc_hc, ldesc_gt, ldesc_cp, ldesc_c, ldesc_gtp
|
||||
local sdesc_cp = row[4]
|
||||
local sdesc_c = row[5]
|
||||
local ldesc_hc, ldesc_gt, ldesc_cp, ldesc_c
|
||||
local create_entry
|
||||
local ename_hc, ename_gt, ename_cp, ename_c, ename_gtp
|
||||
local ename_hc, ename_gt, ename_cp, ename_c
|
||||
local ltt_cp = cp_tt
|
||||
if is_canonical then
|
||||
ldesc_hc = hc_desc
|
||||
ldesc_gt = gt_desc
|
||||
ldesc_gtp = gtp_desc
|
||||
ldesc_cp = cp_desc
|
||||
ldesc_c = c_desc
|
||||
ename_hc = S("Colored Terracotta")
|
||||
ename_gt = S("Glazed Terracotta")
|
||||
ename_gtp = S("Glazed Terracotta Pillar")
|
||||
ename_cp = S("Concrete Powder")
|
||||
ename_c = S("Concrete")
|
||||
else
|
||||
create_entry = false
|
||||
end
|
||||
local craft_color_group = row[7]
|
||||
local craft_color_group = row[6]
|
||||
-- Node Definition
|
||||
minetest.register_node("mcl_colorblocks:hardened_clay_"..name, {
|
||||
description = sdesc_hc,
|
||||
|
|
@ -166,22 +162,6 @@ for _, row in ipairs(block.dyes) do
|
|||
_mcl_hardness = 1.4,
|
||||
on_rotate = on_rotate,
|
||||
})
|
||||
minetest.register_node("mcl_colorblocks:glazed_terracotta_pillar_"..name, {
|
||||
description = sdesc_gtp,
|
||||
_doc_items_longdesc = ldesc_gtp,
|
||||
_doc_items_create_entry = create_entry,
|
||||
_doc_items_entry_name = ename_gtp,
|
||||
tiles = {"mcl_colorblocks_glazed_terracotta_pillar_top_"..name..".png", "mcl_colorblocks_glazed_terracotta_pillar_top_"..name..".png", "mcl_colorblocks_glazed_terracotta_pillar_side_"..name..".png"},
|
||||
groups = {handy=1,pickaxey=1, glazed_terracotta=1,building_block=1, material_stone=1},
|
||||
paramtype2 = "facedir",
|
||||
stack_max = 64,
|
||||
is_ground_content = false,
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
_mcl_blast_resistance = 4.2,
|
||||
_mcl_hardness = 1.4,
|
||||
on_place = mcl_util.rotate_axis,
|
||||
on_rotate = on_rotate,
|
||||
})
|
||||
|
||||
if not is_canonical and doc_mod then
|
||||
doc.add_entry_alias("nodes", "mcl_colorblocks:hardened_clay_"..canonical_color, "nodes", "mcl_colorblocks:hardened_clay_"..name)
|
||||
|
|
@ -216,16 +196,6 @@ for _, row in ipairs(block.dyes) do
|
|||
recipe = "mcl_colorblocks:hardened_clay_"..name,
|
||||
cooktime = 10,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_colorblocks:glazed_terracotta_pillar_"..name.." 2",
|
||||
recipe = {
|
||||
{"mcl_colorblocks:glazed_terracotta_"..name},
|
||||
{"mcl_colorblocks:glazed_terracotta_"..name},
|
||||
}
|
||||
})
|
||||
|
||||
mcl_stonecutter.register_recipe("mcl_colorblocks:glazed_terracotta_"..name, "mcl_colorblocks:glazed_terracotta_pillar_"..name)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,94 +1,76 @@
|
|||
# textdomain: mcl_colorblocks
|
||||
White Terracotta=Terre cuite blanche
|
||||
White Glazed Terracotta=Terre cuite emaillée blanche
|
||||
White Glazed Terracotta Pillar=Pilier de terre cuite emaillée blanche
|
||||
White Concrete Powder=Béton en poudre blanc
|
||||
White Concrete=Béton blanc
|
||||
Grey Terracotta=Terre cuite grise
|
||||
Grey Glazed Terracotta=Terre cuite emaillée grise
|
||||
Grey Glazed Terracotta Pillar=Pilier de terre cuite emaillée grise
|
||||
Grey Concrete Powder=Béton en goudre gris
|
||||
Grey Concrete=Béton gris
|
||||
Light Grey Terracotta=Terre cuite gris clair
|
||||
Light Grey Glazed Terracotta=Terre cuite emaillée gris clair
|
||||
Light Grey Glazed Terracotta Pillar=Pilier de terre cuite emaillée gris clair
|
||||
Light Grey Concrete Powder=Béton en poudre gris clair
|
||||
Light Grey Concrete=Béton gris clair
|
||||
Black Terracotta=Terre cuite noir
|
||||
Black Glazed Terracotta=Terre cuite emaillée noir
|
||||
Black Glazed Terracotta Pillar=Pilier de terre cuite emaillée noir
|
||||
Black Concrete Powder=Béton en poudre noir
|
||||
Black Concrete=Béton noir
|
||||
Red Terracotta=Terre cuite rouge
|
||||
Red Glazed Terracotta=Terre cuite emaillée rouge
|
||||
Red Glazed Terracotta Pillar=Pilier de terre cuite emaillée rouge
|
||||
Red Concrete Powder=Béton en poudre rouge
|
||||
Red Concrete=Béton rouge
|
||||
Yellow Terracotta=Terre cuite jaune
|
||||
Yellow Glazed Terracotta=Terre cuite emaillée jaune
|
||||
Yellow Glazed Terracotta Pillar=Pilier de terre cuite emaillée jaune
|
||||
Yellow Concrete Powder=Béton en poudre jaune
|
||||
Yellow Concrete=Béton jaune
|
||||
Green Terracotta=Terre cuite verte
|
||||
Green Glazed Terracotta=Terre cuite emaillée verte
|
||||
Green Glazed Terracotta Pillar=Pilier de terre cuite emaillée verte
|
||||
Green Concrete Powder=Béton en poudre vert
|
||||
Green Concrete=Béton vert
|
||||
Cyan Terracotta=Terre cuite cyan
|
||||
Cyan Glazed Terracotta=Terre cuite emaillée cyan
|
||||
Cyan Glazed Terracotta Pillar=Pilier de terre cuite emaillée cyan
|
||||
Cyan Concrete Powder=Béton en poudre cyan
|
||||
Cyan Concrete=Béton cyan
|
||||
Blue Terracotta=Terre cuite bleue
|
||||
Blue Glazed Terracotta=Terre cuite emaillée bleue
|
||||
Blue Glazed Terracotta Pillar=Pilier de terre cuite emaillée bleue
|
||||
Blue Concrete Powder=Béton en poudre bleu
|
||||
Blue Concrete=Béton bleu
|
||||
Magenta Terracotta=Terre cuite magenta
|
||||
Magenta Glazed Terracotta=Terre cuite emaillée magenta
|
||||
Magenta Glazed Terracotta Pillar=Pilier de terre cuite emaillée magenta
|
||||
Magenta Concrete Powder=Béton en poudre magenta
|
||||
Magenta Concrete=Béton magenta
|
||||
Orange Terracotta=Terre cuite orange
|
||||
Orange Glazed Terracotta=Terre cuite emaillée orange
|
||||
Orange Glazed Terracotta Pillar=Pilier de terre cuite emaillée orange
|
||||
Orange Concrete Powder=Béton en poudre orange
|
||||
Orange Concrete=Béton orange
|
||||
Purple Terracotta=Terre cuite violette
|
||||
Purple Glazed Terracotta=Terre cuite emaillée violette
|
||||
Purple Glazed Terracotta Pillar=Pilier de terre cuite emaillée violette
|
||||
Purple Concrete Powder=Béton en poudre violet
|
||||
Purple Concrete=Béton violet
|
||||
Brown Terracotta=Terre cuite marron
|
||||
Brown Glazed Terracotta=Terre cuite emaillée marron
|
||||
Brown Glazed Terracotta Pillar=Pilier de terre cuite emaillée marron
|
||||
Brown Concrete Powder=Béton en poudre marron
|
||||
Brown Concrete=Béton marron
|
||||
Pink Terracotta=Terre cuite rose
|
||||
Pink Glazed Terracotta=Terre cuite emaillée rose
|
||||
Pink Glazed Terracotta Pillar=Pilier de terre cuite emaillée rose
|
||||
Pink Concrete Powder=Béton en poudre rose
|
||||
Pink Concrete=Béton rose
|
||||
Lime Terracotta=Terre cuite verte clair
|
||||
Lime Glazed Terracotta=Terre cuite emaillée verte clair
|
||||
Lime Glazed Terracotta Pillar=Pilier de terre cuite emaillée verte clair
|
||||
Lime Concrete Powder=Béton en poudre vert clair
|
||||
Lime Concrete=Béton vert clair
|
||||
Light Blue Terracotta=Terre cuite bleu clair
|
||||
Light Blue Glazed Terracotta=Terre cuite emaillée bleu clair
|
||||
Light Blue Glazed Terracotta Pillar=Pilier de terre cuite emaillée bleu clair
|
||||
Light Blue Concrete Powder=Béton en poudre bleu clair
|
||||
Light Blue Concrete=Béton bleu clair
|
||||
Terracotta is a basic building material. It comes in many different colors.=La terre cuite est un matériau de construction de base. Il est disponible dans de nombreuses couleurs différentes.
|
||||
Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.=La terre cuite émaillée est un bloc décoratif au motif complexe. Il peut être tourné en le plaçant dans différentes directions.
|
||||
Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.=Le pilier de terre cuite émaillée est un bloc décoratif au motif complexe. Il peut être utilisé avec la terre cuite émaillée pour réaliser des motifs impairs.
|
||||
Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.=La poudre de béton est utilisée pour créer du béton, mais elle peut également être utilisée comme décoration elle-même. Il est disponible en différentes couleurs. La poudre de béton se transforme en béton de la même couleur au contact de l'eau.
|
||||
Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.=Le béton est un bloc décoratif qui se décline en de nombreuses couleurs différentes. Il est remarquable pour avoir une couleur très forte et propre.
|
||||
Terracotta=Terre cuite
|
||||
Terracotta is a basic building material which comes in many different colors. This particular block is uncolored.=La terre cuite est un matériau de construction de base qui se décline en de nombreuses couleurs différentes. Ce bloc particulier n'est pas coloré.
|
||||
Colored Terracotta=Terre cuite colorée
|
||||
Glazed Terracotta=Terre cuite emaillée
|
||||
Glazed Terracotta Pillar=Pilier de terre cuite emaillée
|
||||
Concrete Powder=Béton en poudre
|
||||
Concrete=Béton
|
||||
Turns into concrete on water contact=Se transforme en béton au contact de l'eau
|
||||
|
|
|
|||
|
|
@ -1,94 +1,76 @@
|
|||
# textdomain: mcl_colorblocks
|
||||
White Terracotta=
|
||||
White Glazed Terracotta=
|
||||
White Glazed Terracotta Pillar=
|
||||
White Concrete Powder=
|
||||
White Concrete=
|
||||
Grey Terracotta=
|
||||
Grey Glazed Terracotta=
|
||||
Grey Glazed Terracotta Pillar=
|
||||
Grey Concrete Powder=
|
||||
Grey Concrete=
|
||||
Light Grey Terracotta=
|
||||
Light Grey Glazed Terracotta=
|
||||
Light Grey Glazed Terracotta Pillar=
|
||||
Light Grey Concrete Powder=
|
||||
Light Grey Concrete=
|
||||
Black Terracotta=
|
||||
Black Glazed Terracotta=
|
||||
Black Glazed Terracotta Pillar=
|
||||
Black Concrete Powder=
|
||||
Black Concrete=
|
||||
Red Terracotta=
|
||||
Red Glazed Terracotta=
|
||||
Red Glazed Terracotta Pillar=
|
||||
Red Concrete Powder=
|
||||
Red Concrete=
|
||||
Yellow Terracotta=
|
||||
Yellow Glazed Terracotta=
|
||||
Yellow Glazed Terracotta Pillar=
|
||||
Yellow Concrete Powder=
|
||||
Yellow Concrete=
|
||||
Green Terracotta=
|
||||
Green Glazed Terracotta=
|
||||
Green Glazed Terracotta Pillar=
|
||||
Green Concrete Powder=
|
||||
Green Concrete=
|
||||
Cyan Terracotta=
|
||||
Cyan Glazed Terracotta=
|
||||
Cyan Glazed Terracotta Pillar=
|
||||
Cyan Concrete Powder=
|
||||
Cyan Concrete=
|
||||
Blue Terracotta=
|
||||
Blue Glazed Terracotta=
|
||||
Blue Glazed Terracotta Pillar=
|
||||
Blue Concrete Powder=
|
||||
Blue Concrete=
|
||||
Magenta Terracotta=
|
||||
Magenta Glazed Terracotta=
|
||||
Magenta Glazed Terracotta Pillar=
|
||||
Magenta Concrete Powder=
|
||||
Magenta Concrete=
|
||||
Orange Terracotta=
|
||||
Orange Glazed Terracotta=
|
||||
Orange Glazed Terracotta Pillar=
|
||||
Orange Concrete Powder=
|
||||
Orange Concrete=
|
||||
Purple Terracotta=
|
||||
Purple Glazed Terracotta=
|
||||
Purple Glazed Terracotta Pillar=
|
||||
Purple Concrete Powder=
|
||||
Purple Concrete=
|
||||
Brown Terracotta=
|
||||
Brown Glazed Terracotta=
|
||||
Brown Glazed Terracotta Pillar=
|
||||
Brown Concrete Powder=
|
||||
Brown Concrete=
|
||||
Pink Terracotta=
|
||||
Pink Glazed Terracotta=
|
||||
Pink Glazed Terracotta Pillar=
|
||||
Pink Concrete Powder=
|
||||
Pink Concrete=
|
||||
Lime Terracotta=
|
||||
Lime Glazed Terracotta=
|
||||
Lime Glazed Terracotta Pillar=
|
||||
Lime Concrete Powder=
|
||||
Lime Concrete=
|
||||
Light Blue Terracotta=
|
||||
Light Blue Glazed Terracotta=
|
||||
Light Blue Glazed Terracotta Pillar=
|
||||
Light Blue Concrete Powder=
|
||||
Light Blue Concrete=
|
||||
Terracotta is a basic building material. It comes in many different colors.=
|
||||
Glazed terracotta is a decorative block with a complex pattern. It can be rotated by placing it in different directions.=
|
||||
Glazed terracotta pillar is a decorative block with a complex pattern. It can be used with Glazed terracotta to make uneven patterns.=
|
||||
Concrete powder is used for creating concrete, but it can also be used as decoration itself. It comes in different colors. Concrete powder turns into concrete of the same color when it comes in contact with water.=
|
||||
Concrete is a decorative block which comes in many different colors. It is notable for having a very strong and clean color.=
|
||||
Terracotta=
|
||||
Terracotta is a basic building material which comes in many different colors. This particular block is uncolored.=
|
||||
Colored Terracotta=
|
||||
Glazed Terracotta=
|
||||
Glazed Terracotta Pillar=
|
||||
Concrete Powder=
|
||||
Concrete=
|
||||
Turns into concrete on water contact=
|
||||
|
|
|
|||
|
|
@ -181,67 +181,6 @@ local function eat_gapple(itemstack, placer, pointed_thing)
|
|||
return gapple_hunger_restore(itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
local function eat_gapple_delayed(itemstack, placer, pointed_thing)
|
||||
|
||||
if pointed_thing.type == "node" then
|
||||
local node = minetest.get_node(pointed_thing.under)
|
||||
if placer and not placer:get_player_control().sneak then
|
||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
||||
end
|
||||
end
|
||||
elseif pointed_thing.type == "object" then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local function eat_gapple(itemstack, placer, pointed_thing)
|
||||
if pointed_thing.type == "node" then
|
||||
local node = minetest.get_node(pointed_thing.under)
|
||||
if placer and not placer:get_player_control().sneak then
|
||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
|
||||
end
|
||||
end
|
||||
elseif pointed_thing.type == "object" then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local regen_duration, absorbtion_factor = 5, 1
|
||||
if itemstack:get_name() == "mcl_core:apple_gold_enchanted" then
|
||||
regen_duration, absorbtion_factor = 20, 4
|
||||
mcl_potions.fire_resistance_func(placer, 1, 300)
|
||||
mcl_potions.leaping_func(placer, 1, 300)
|
||||
if enable_fapples then
|
||||
mcl_potions.swiftness_func(placer, absorbtion_factor, 120)
|
||||
end
|
||||
end
|
||||
-- TODO: Absorbtion
|
||||
mcl_potions.regeneration_func(placer, 2, regen_duration)
|
||||
--return gapple_hunger_restore(itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
-- Wrapper for handling mcl_hunger delayed eating
|
||||
local name = placer:get_player_name()
|
||||
mcl_hunger.eat_internal[name]._custom_itemstack = itemstack -- Used as comparison to make sure the custom wrapper executes only when the same item is eaten
|
||||
mcl_hunger.eat_internal[name]._custom_var = {
|
||||
itemstack = itemstack,
|
||||
placer = placer,
|
||||
pointed_thing = pointed_thing,
|
||||
}
|
||||
mcl_hunger.eat_internal[name]._custom_func = eat_gapple
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper = function(name)
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_func(
|
||||
mcl_hunger.eat_internal[name]._custom_var.itemstack,
|
||||
mcl_hunger.eat_internal[name]._custom_var.placer,
|
||||
mcl_hunger.eat_internal[name]._custom_var.pointed_thing
|
||||
)
|
||||
end
|
||||
|
||||
--mcl_hunger.eat_internal[name]._custom_do_delayed = true -- Only _custom_wrapper will be executed after holding RMB or LMB within a specified delay
|
||||
minetest.do_item_eat(4, nil, itemstack, placer, pointed_thing)
|
||||
end
|
||||
|
||||
minetest.register_craftitem("mcl_core:apple_gold", {
|
||||
-- TODO: Add special highlight color
|
||||
description = S("Golden Apple"),
|
||||
|
|
@ -249,10 +188,8 @@ minetest.register_craftitem("mcl_core:apple_gold", {
|
|||
wield_image = "mcl_core_apple_golden.png",
|
||||
inventory_image = "mcl_core_apple_golden.png",
|
||||
stack_max = 64,
|
||||
--on_place = eat_gapple, -- Will do effect immediately but not reduce item count until eating delay ends which makes it exploitable by deliberately not finishing delay
|
||||
--on_secondary_use = eat_gapple,
|
||||
on_place = eat_gapple_delayed,
|
||||
on_secondary_use = eat_gapple_delayed,
|
||||
on_place = eat_gapple,
|
||||
on_secondary_use = eat_gapple,
|
||||
groups = { food = 2, eatable = 4, can_eat_when_full = 1 },
|
||||
_mcl_saturation = 9.6,
|
||||
})
|
||||
|
|
@ -263,10 +200,8 @@ minetest.register_craftitem("mcl_core:apple_gold_enchanted", {
|
|||
wield_image = "mcl_core_apple_golden.png" .. mcl_enchanting.overlay,
|
||||
inventory_image = "mcl_core_apple_golden.png" .. mcl_enchanting.overlay,
|
||||
stack_max = 64,
|
||||
--on_place = eat_gapple,
|
||||
--on_secondary_use = eat_gapple,
|
||||
on_place = eat_gapple_delayed,
|
||||
on_secondary_use = eat_gapple_delayed,
|
||||
on_place = eat_gapple,
|
||||
on_secondary_use = eat_gapple,
|
||||
groups = { food = 2, eatable = 4, can_eat_when_full = 1 },
|
||||
_mcl_saturation = 9.6,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -135,4 +135,4 @@ minetest.register_node("mcl_core:reeds", {
|
|||
end,
|
||||
_mcl_blast_resistance = 0,
|
||||
_mcl_hardness = 0,
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# textdomain: mcl_crafting_table
|
||||
Crafting Table=Etabli
|
||||
A crafting table is a block which grants you access to a 3×3 crafting grid which allows you to perform advanced crafts.=Un établi est un bloc qui vous donne accès à une grille d'établi 3×3 qui vous permet de fabriquer des objets avancés.
|
||||
A crafting table is a block which grants you access to a 3×3 crafting grid which allows you to perform advanced crafts.=Un établi est un bloc qui vous donne accès à une grille d'établi 3×3 qui vous permet d'effectuer des objets avancés.
|
||||
Rightclick the crafting table to access the 3×3 crafting grid.=Faites un clic droit sur l'établi pour accéder à la grille d'établi 3x3.
|
||||
Recipe book=Livre de Recette
|
||||
Crafting=Fabriquer
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ local modpath = minetest.get_modpath(modname)
|
|||
-- by debiankaios
|
||||
-- adapted for mcl2 by cora
|
||||
|
||||
local wood_slab_groups = {handy = 1, axey = 1, material_wood = 1, wood_slab = 1}
|
||||
local wood_stair_groups = {handy = 1, axey = 1, material_wood = 1, wood_stairs = 1}
|
||||
local wood_slab_groups = {handy = 1, axey = 1, flammable = 3, material_wood = 1, fire_encouragement = 5, fire_flammability = 20, wood_slab = 1}
|
||||
local wood_stair_groups = {handy = 1, axey = 1, flammable = 3, material_wood = 1, fire_encouragement = 5, fire_flammability = 20, wood_stairs = 1}
|
||||
|
||||
local function generate_warped_tree(pos)
|
||||
minetest.place_schematic(pos,modpath.."/schematics/warped_fungus_1.mts","random",nil,false,"place_center_x,place_center_z")
|
||||
|
|
@ -148,22 +148,6 @@ minetest.register_node("mcl_crimson:twisting_vines", {
|
|||
end
|
||||
return itemstack
|
||||
end,
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
local under = pointed_thing.under
|
||||
local above = pointed_thing.above
|
||||
local unode = minetest.get_node(under)
|
||||
if under.y < above.y then
|
||||
minetest.set_node(above, {name = "mcl_crimson:twisting_vines"})
|
||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||
itemstack:take_item()
|
||||
end
|
||||
else
|
||||
if unode.name == "mcl_crimson:twisting_vines" then
|
||||
return minetest.registered_nodes[unode.name].on_rightclick(under, unode, placer, itemstack, pointed_thing)
|
||||
end
|
||||
end
|
||||
return itemstack
|
||||
end,
|
||||
on_dig = function(pos, node, digger)
|
||||
local above = vector.offset(pos,0,1,0)
|
||||
local abovenode = minetest.get_node(above)
|
||||
|
|
@ -239,22 +223,7 @@ minetest.register_node("mcl_crimson:weeping_vines", {
|
|||
end
|
||||
return itemstack
|
||||
end,
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
local under = pointed_thing.under
|
||||
local above = pointed_thing.above
|
||||
local unode = minetest.get_node(under)
|
||||
if under.y > above.y then
|
||||
minetest.set_node(above, {name = "mcl_crimson:weeping_vines"})
|
||||
if not minetest.is_creative_enabled(placer:get_player_name()) then
|
||||
itemstack:take_item()
|
||||
end
|
||||
else
|
||||
if unode.name == "mcl_crimson:weeping_vines" then
|
||||
return minetest.registered_nodes[unode.name].on_rightclick(under, unode, placer, itemstack, pointed_thing)
|
||||
end
|
||||
end
|
||||
return itemstack
|
||||
end,
|
||||
|
||||
on_dig = function(pos, node, digger)
|
||||
local below = vector.offset(pos,0,-1,0)
|
||||
local belownode = minetest.get_node(below)
|
||||
|
|
@ -463,7 +432,7 @@ minetest.register_craft({
|
|||
minetest.register_node("mcl_crimson:warped_hyphae_wood", {
|
||||
description = S("Warped Hyphae Wood"),
|
||||
tiles = {"mcl_crimson_warped_hyphae_wood.png"},
|
||||
groups = {handy = 5,axey = 1, wood=1,building_block = 1, material_wood = 1},
|
||||
groups = {handy = 5,axey = 1, flammable = 3, wood=1,building_block = 1, material_wood = 1, fire_encouragement = 5, fire_flammability = 20},
|
||||
sounds = mcl_sounds.node_sound_wood_defaults(),
|
||||
_mcl_hardness = 2,
|
||||
})
|
||||
|
|
@ -478,27 +447,6 @@ minetest.register_craft({
|
|||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:warped_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:warped_hyphae_bark"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:warped_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:stripped_warped_hyphae"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:warped_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:stripped_warped_hyphae_bark"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:warped_nylium 2",
|
||||
recipe = {
|
||||
|
|
@ -691,27 +639,6 @@ minetest.register_craft({
|
|||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:crimson_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:crimson_hyphae_bark"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:crimson_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:stripped_crimson_hyphae"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:crimson_hyphae_wood 4",
|
||||
recipe = {
|
||||
{"mcl_crimson:stripped_crimson_hyphae_bark"},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_crimson:crimson_nylium 2",
|
||||
recipe = {
|
||||
|
|
@ -757,7 +684,7 @@ mcl_doors:register_door("mcl_crimson:crimson_door", {
|
|||
_doc_items_longdesc = S("Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal."),
|
||||
_doc_items_usagehelp = S("To open or close a wooden door, rightclick it or supply its lower half with a redstone signal."),
|
||||
inventory_image = "mcl_crimson_crimson_door.png",
|
||||
groups = {handy=1,axey=1, material_wood=1},
|
||||
groups = {handy=1,axey=1, material_wood=1, flammable=-1},
|
||||
_mcl_hardness = 3,
|
||||
_mcl_blast_resistance = 3,
|
||||
tiles_bottom = "mcl_crimson_crimson_door_bottom.png",
|
||||
|
|
@ -772,7 +699,7 @@ mcl_doors:register_trapdoor("mcl_crimson:crimson_trapdoor", {
|
|||
tile_front = "mcl_crimson_crimson_trapdoor.png",
|
||||
tile_side = "mcl_crimson_crimson_trapdoor_side.png",
|
||||
wield_image = "mcl_crimson_crimson_trapdoor.png",
|
||||
groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1},
|
||||
groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
|
||||
_mcl_hardness = 3,
|
||||
_mcl_blast_resistance = 3,
|
||||
sounds = mcl_sounds.node_sound_wood_defaults(),
|
||||
|
|
@ -783,7 +710,7 @@ mcl_fences.register_fence_and_fence_gate(
|
|||
S("Crimson Fence"),
|
||||
S("Crimson Fence Gate"),
|
||||
"mcl_crimson_crimson_fence.png",
|
||||
{handy=1,axey=1,fence_wood=1},
|
||||
{handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20},
|
||||
minetest.registered_nodes["mcl_crimson:crimson_hyphae"]._mcl_hardness,
|
||||
minetest.registered_nodes["mcl_crimson:crimson_hyphae"]._mcl_blast_resistance,
|
||||
{"group:fence_wood"},
|
||||
|
|
@ -795,7 +722,7 @@ mcl_doors:register_door("mcl_crimson:warped_door", {
|
|||
_doc_items_longdesc = S("Wooden doors are 2-block high barriers which can be opened or closed by hand and by a redstone signal."),
|
||||
_doc_items_usagehelp = S("To open or close a wooden door, rightclick it or supply its lower half with a redstone signal."),
|
||||
inventory_image = "mcl_crimson_warped_door.png",
|
||||
groups = {handy=1,axey=1, material_wood=1},
|
||||
groups = {handy=1,axey=1, material_wood=1, flammable=-1},
|
||||
_mcl_hardness = 3,
|
||||
_mcl_blast_resistance = 3,
|
||||
tiles_bottom = "mcl_crimson_warped_door_bottom.png",
|
||||
|
|
@ -810,7 +737,7 @@ mcl_doors:register_trapdoor("mcl_crimson:warped_trapdoor", {
|
|||
tile_front = "mcl_crimson_warped_trapdoor.png",
|
||||
tile_side = "mcl_crimson_warped_trapdoor_side.png",
|
||||
wield_image = "mcl_crimson_warped_trapdoor.png",
|
||||
groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1},
|
||||
groups = {handy=1,axey=1, mesecon_effector_on=1, material_wood=1, flammable=-1},
|
||||
_mcl_hardness = 3,
|
||||
_mcl_blast_resistance = 3,
|
||||
sounds = mcl_sounds.node_sound_wood_defaults(),
|
||||
|
|
@ -821,7 +748,7 @@ mcl_fences.register_fence_and_fence_gate(
|
|||
S("Warped Fence"),
|
||||
S("Warped Fence Gate"),
|
||||
"mcl_crimson_warped_fence.png",
|
||||
{handy=1,axey=1,fence_wood=1},
|
||||
{handy=1,axey=1, flammable=2,fence_wood=1, fire_encouragement=5, fire_flammability=20},
|
||||
minetest.registered_nodes["mcl_crimson:warped_hyphae"]._mcl_hardness,
|
||||
minetest.registered_nodes["mcl_crimson:warped_hyphae"]._mcl_blast_resistance,
|
||||
{"group:fence_wood"},
|
||||
|
|
|
|||
|
|
@ -182,10 +182,6 @@ local function apply_bone_meal(pointed_thing, user)
|
|||
local n = minetest.get_node(pos)
|
||||
if n.name == "" then return false end
|
||||
|
||||
if mcl_util.check_area_protection(pos, pointed_thing.above, user) then
|
||||
return false
|
||||
end
|
||||
|
||||
for _, func in pairs(mcl_dye.bone_meal_callbacks) do
|
||||
if func(pointed_thing, user) then
|
||||
return true
|
||||
|
|
|
|||
|
|
@ -60,20 +60,32 @@ minetest.register_node("mcl_end:purpur_pillar", {
|
|||
})
|
||||
|
||||
local end_rod_name = "mcl_end:end_rod"
|
||||
local end_rod_side_tex = "mcl_end_end_rod_side.png"
|
||||
local end_rod_def = {
|
||||
description = S("End Rod"),
|
||||
_doc_items_longdesc = S("End rods are decorative light sources."),
|
||||
tiles = {
|
||||
"mcl_end_end_rod.png",
|
||||
"mcl_end_end_rod_top.png",
|
||||
"mcl_end_end_rod_bottom.png",
|
||||
end_rod_side_tex,
|
||||
end_rod_side_tex,
|
||||
end_rod_side_tex,
|
||||
end_rod_side_tex,
|
||||
},
|
||||
drawtype = "mesh",
|
||||
mesh = "mcl_end_rod.obj",
|
||||
drawtype = "nodebox",
|
||||
is_ground_content = false,
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
light_source = minetest.LIGHT_MAX,
|
||||
sunlight_propagates = true,
|
||||
groups = { dig_immediate=3, deco_block=1, destroy_by_lava_flow=1, end_rod=1 },
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-0.125, -0.5, -0.125, 0.125, -0.4375, 0.125}, -- Base
|
||||
{-0.0625, -0.4375, -0.0625, 0.0625, 0.5, 0.0625}, -- Rod
|
||||
},
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
|
|
@ -144,7 +156,8 @@ local colored_end_rods = {
|
|||
{"lime", S("Lime End Rod"), "green"},
|
||||
{"lightblue", S("Light Blue End Rod"), "lightblue"},
|
||||
}
|
||||
local end_rod_mask = "^[mask:mcl_end_end_rod_mask.png"
|
||||
local top_mask = "^[mask:mobs_mc_empty.png\\^[fill\\:2x2\\:7,7\\:white"
|
||||
local side_mask = "^[mask:mobs_mc_empty.png\\^[fill\\:16x15\\:0,0\\:white"
|
||||
for num, row in ipairs(colored_end_rods) do
|
||||
local name = row[1]
|
||||
local desc = row[2]
|
||||
|
|
@ -155,12 +168,16 @@ for num, row in ipairs(colored_end_rods) do
|
|||
def._doc_items_create_entry = false
|
||||
local side_tex
|
||||
if name == "pink" then
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. end_rod_mask .. "^[multiply:" .. name .. "^[hsl:0:300)"
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. top_mask .. "^[multiply:" .. name .. "^[hsl:0:300)"
|
||||
side_tex = end_rod_side_tex .. "^(" .. end_rod_side_tex .. side_mask .. "^[multiply:" .. name .. "^[hsl:0:300)"
|
||||
elseif num > 4 then
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. end_rod_mask .. "^[multiply:" .. name .. "^[hsl:0:300^[opacity:120)"
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. top_mask .. "^[multiply:" .. name .. "^[hsl:0:300^[opacity:120)"
|
||||
side_tex = end_rod_side_tex .. "^(" .. end_rod_side_tex .. side_mask .. "^[multiply:" .. name .. "^[hsl:0:300^[opacity:120)"
|
||||
else
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. end_rod_mask .. "^[multiply:" .. name .. "^[hsl:0:-100^[opacity:170)"
|
||||
def.tiles[1] = def.tiles[1] .. "^(" .. def.tiles[1] .. top_mask .. "^[multiply:" .. name .. "^[hsl:0:-100^[opacity:170)"
|
||||
side_tex = end_rod_side_tex .. "^(" .. end_rod_side_tex .. side_mask .. "^[multiply:" .. name .. "^[hsl:0:-100^[opacity:170)"
|
||||
end
|
||||
for i=3, 6 do def.tiles[i] = side_tex end
|
||||
minetest.register_node(end_rod_name.."_"..name, def)
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ A chorus plant stem is the part of a chorus plant which holds the whole plant to
|
|||
Chorus Fruit=Fruit de chorus
|
||||
A chorus fruit is an edible fruit from the chorus plant which is home to the End. Eating it teleports you to the top of a random solid block nearby, provided you won't end up inside a liquid, solid or harmful blocks. Teleportation might fail if there are very few or no places to teleport to.=Un fruit de chorus est un fruit comestible de l'usine de chorus qui abrite la fin. Le manger vous téléporte au sommet d'un bloc solide aléatoire à proximité, à condition de ne pas vous retrouver dans un bloc liquide, solide ou nuisible. La téléportation peut échouer s'il y a très peu ou pas d'endroits où se téléporter.
|
||||
Popped Chorus Fruit=Chorus éclaté
|
||||
Eye of Ender=Oeil de l'Ender
|
||||
Eye of Ender=Œil de l'Ender
|
||||
This item is used to locate End portal shrines in the Overworld and to activate End portals.=Cet objet est utilisé pour localiser les sanctuaires du portail de l'End dans l'Overworld et pour activer les portails de l'End.
|
||||
Use the attack key to release the eye of ender. It will rise and fly in the horizontal direction of the closest end portal shrine. If you're very close, the eye of ender will take the direct path to the End portal shrine instead. After a few seconds, it stops. It may drop as an item, but there's a 20% chance it shatters.=Utilisez la touche d'attaque pour libérer l'œil d'Ender. Il s'élèvera et volera dans la direction horizontale du sanctuaire portail de l'End le plus proche. Si vous êtes très proche, l'œil d'Ender empruntera le chemin direct vers le sanctuaire du portail de l'End. Après quelques secondes, il s'arrête. Il peut tomber en tant qu'objet, mais il y a 20% de chances qu'il se brise.
|
||||
To activate an End portal, eyes of ender need to be placed into each block of an intact End portal frame.=Pour activer un portail de l'End, les yeux d'ender doivent être placés dans chaque bloc d'un cadre de portail de l'End intact.
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
# Blender 3.6.7
|
||||
# www.blender.org
|
||||
o Cube
|
||||
v 0.125000 -0.437500 -0.125000
|
||||
v 0.125000 -0.500000 -0.125000
|
||||
v 0.125000 -0.437500 0.125000
|
||||
v 0.125000 -0.500000 0.125000
|
||||
v -0.125000 -0.437500 -0.125000
|
||||
v -0.125000 -0.500000 -0.125000
|
||||
v -0.125000 -0.437500 0.125000
|
||||
v -0.125000 -0.500000 0.125000
|
||||
v -0.062500 -0.437500 0.062500
|
||||
v -0.062500 0.500000 0.062500
|
||||
v -0.062500 -0.437500 -0.062500
|
||||
v -0.062500 0.500000 -0.062500
|
||||
v 0.062500 -0.437500 0.062500
|
||||
v 0.062500 0.500000 0.062500
|
||||
v 0.062500 -0.437500 -0.062500
|
||||
v 0.062500 0.500000 -0.062500
|
||||
vn -0.0000 1.0000 -0.0000
|
||||
vn -0.0000 -0.0000 1.0000
|
||||
vn -1.0000 -0.0000 -0.0000
|
||||
vn -0.0000 -1.0000 -0.0000
|
||||
vn 1.0000 -0.0000 -0.0000
|
||||
vn -0.0000 -0.0000 -1.0000
|
||||
vt 0.250000 1.000000
|
||||
vt -0.000000 1.000000
|
||||
vt -0.000000 0.750000
|
||||
vt 0.250000 0.750000
|
||||
vt 0.250000 0.000000
|
||||
vt 0.250000 0.062500
|
||||
vt 0.000000 0.062500
|
||||
vt 0.000000 0.000000
|
||||
vt 1.000000 0.000000
|
||||
vt 1.000000 0.062500
|
||||
vt 0.750000 0.062500
|
||||
vt 0.750000 0.000000
|
||||
vt 0.000000 0.437500
|
||||
vt 0.250000 0.437500
|
||||
vt 0.250000 0.687500
|
||||
vt 0.000000 0.687500
|
||||
vt 0.500000 0.000000
|
||||
vt 0.500000 0.062500
|
||||
vt 1.000000 1.000000
|
||||
vt 0.875000 1.000000
|
||||
vt 0.875000 0.062500
|
||||
vt 0.750000 1.000000
|
||||
vt 0.625000 1.000000
|
||||
vt 0.625000 0.062500
|
||||
vt 0.500000 1.000000
|
||||
vt 0.187500 0.812500
|
||||
vt 0.187500 0.937500
|
||||
vt 0.062500 0.937500
|
||||
vt 0.062500 0.812500
|
||||
s 0
|
||||
f 1/1/1 5/2/1 7/3/1 3/4/1
|
||||
f 4/5/2 3/6/2 7/7/2 8/8/2
|
||||
f 8/9/3 7/10/3 5/11/3 6/12/3
|
||||
f 6/13/4 2/14/4 4/15/4 8/16/4
|
||||
f 2/17/5 1/18/5 3/6/5 4/5/5
|
||||
f 6/12/6 5/11/6 1/18/6 2/17/6
|
||||
f 9/10/3 10/19/3 12/20/3 11/21/3
|
||||
f 11/21/6 12/20/6 16/22/6 15/11/6
|
||||
f 15/11/5 16/22/5 14/23/5 13/24/5
|
||||
f 13/24/2 14/23/2 10/25/2 9/18/2
|
||||
f 11/26/4 15/27/4 13/28/4 9/29/4
|
||||
f 16/27/1 12/28/1 10/29/1 14/26/1
|
||||
|
|
@ -157,7 +157,7 @@ minetest.register_craftitem("mcl_farming:beetroot_soup", {
|
|||
wield_image = "mcl_farming_beetroot_soup.png",
|
||||
on_place = minetest.item_eat(6, "mcl_core:bowl"),
|
||||
on_secondary_use = minetest.item_eat(6, "mcl_core:bowl"),
|
||||
groups = { food = 2, eatable = 6 },
|
||||
groups = { food = 3, eatable = 6 },
|
||||
_mcl_saturation = 7.2,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ Hay bales are decorative blocks made from wheat.=Les balles de foin sont des blo
|
|||
To carve a face into the pumpkin, use the shears on the side you want to carve.=Pour sculpter un visage dans la citrouille, utilisez les cisailles du côté que vous souhaitez sculpter.
|
||||
Use the “Place” key on an animal to try to feed it wheat.=Utilisez la touche "Placer" sur un animal pour essayer de le nourrir de blé.
|
||||
Grows on farmland=Pousse sur les terres agricoles
|
||||
Turns block into farmland=Transforme un bloc en terre agricole
|
||||
Turns block into farmland=Transforme un bloc en terres agricoles
|
||||
60% chance of poisoning=60% de chances d'empoisonnement
|
||||
Surface for crops=Surface pour les cultures
|
||||
Can become wet=Peut devenir humide
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Fishing Rod=Canne à pêche
|
||||
Fishing rods can be used to catch fish.=Les cannes à pêche peuvent être utilisées pour attraper du poisson.
|
||||
Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?=Clic droit pour lancer le bouchon. Lorsqu'il s'enfonce, cliquez de nouveau avec le bouton droit pour rembobiner. Qui sait ce que tu vas attraper?
|
||||
Raw Fish=Poisson cru
|
||||
Raw Fish=Poisson Cru
|
||||
Raw fish is obtained by fishing and is a food item which can be eaten safely. Cooking it improves its nutritional value.=Le poisson cru est obtenu par la pêche et est un aliment qui peut être mangé en toute sécurité. La cuisson améliore sa valeur nutritive.
|
||||
Cooked Fish=Poisson cuit
|
||||
Mmh, fish! This is a healthy food item.=Mmh, poisson! Il s'agit d'un aliment sain.
|
||||
|
|
@ -10,9 +10,9 @@ Raw Salmon=Saumon cru
|
|||
Raw salmon is obtained by fishing and is a food item which can be eaten safely. Cooking it improves its nutritional value.=Le saumon cru est obtenu par la pêche et est un aliment qui peut être consommé en toute sécurité. La cuisson améliore sa valeur nutritive.
|
||||
Cooked Salmon=Saumon cuit
|
||||
This is a healthy food item which can be eaten.=Il s'agit d'un aliment sain qui peut être consommé.
|
||||
Clownfish=Poisson-clown
|
||||
Clownfish=Poisson-Clown
|
||||
Clownfish may be obtained by fishing (and luck) and is a food item which can be eaten safely.=Le poisson-clown peut être obtenu par la pêche (et la chance) et est un aliment qui peut être mangé en toute sécurité.
|
||||
Pufferfish=Poisson-globe
|
||||
Pufferfish=Poisson-Globe
|
||||
Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).=Le poisson-globe est une espèce de poisson commune et peut être obtenu par la pêche. Ils peuvent techniquement être mangés, mais ils sont très mauvais pour les humains. Manger un poisson-globe ne restaure que 1 point de faim et vous empoisonnera fortement (ce qui draine votre santé de manière non fatale) et provoque une grave intoxication alimentaire (qui augmente votre faim).
|
||||
Catches fish in water=Attrape les poissons dans l'eau
|
||||
Very poisonous=Très toxique
|
||||
|
|
|
|||
|
|
@ -183,36 +183,6 @@ def_fern.groups.compostability = 65
|
|||
|
||||
minetest.register_node("mcl_flowers:fern", def_fern)
|
||||
|
||||
|
||||
--- Clover ---
|
||||
-- Similar deal as fern, we can copy a lot from tall grass
|
||||
local def_clover = table.copy(def_tallgrass)
|
||||
def_clover.description = S("Clover")
|
||||
def_clover._doc_items_longdesc = S("Clovers are small plants which occur naturally in plains and other temperate biomes. They can be picked up and planted again.")
|
||||
def_clover.drawtype = "mesh"
|
||||
def_clover.mesh = "mcl_clover_3leaf.obj"
|
||||
def_clover.tiles = { "mcl_flowers_clover.png" }
|
||||
def_clover.inventory_image = "mcl_flowers_clover_inv.png"
|
||||
def_clover.wield_image = "mcl_flowers_clover_inv.png"
|
||||
def_clover.drop = nil
|
||||
def_clover.selection_box = {
|
||||
type = "fixed",
|
||||
fixed = { -4/16, -0.5, -4/16, 4/16, 0, 4/16 },
|
||||
}
|
||||
def_clover.groups.compostability = 30
|
||||
|
||||
minetest.register_node("mcl_flowers:clover", def_clover)
|
||||
|
||||
local def_4l_clover = table.copy(def_clover)
|
||||
def_4l_clover.description = S("Four-leaf Clover")
|
||||
def_4l_clover._doc_items_longdesc = S("Clovers are small plants which occur naturally in plains and other temperate biomes. They can be picked up and planted again.")
|
||||
def_4l_clover.mesh = "mcl_clover_4leaf.obj"
|
||||
def_4l_clover.tiles = { "mcl_flowers_fourleaf_clover.png" }
|
||||
def_4l_clover.inventory_image = "mcl_flowers_fourleaf_clover_inv.png"
|
||||
def_4l_clover.wield_image = "mcl_flowers_fourleaf_clover_inv.png"
|
||||
|
||||
minetest.register_node("mcl_flowers:fourleaf_clover", def_4l_clover)
|
||||
|
||||
if has_mcl_flowerpots then
|
||||
mcl_flowerpots.register_potted_flower("mcl_flowers:fern", {
|
||||
name = "fern",
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
# Blender 3.6.7
|
||||
# www.blender.org
|
||||
mtllib mcl_clover_3leaf.mtl
|
||||
o Plane
|
||||
v 0.000000 -0.280000 0.000000
|
||||
v 0.000000 -0.280000 0.000000
|
||||
v -0.250000 -0.280000 -0.250000
|
||||
v 0.250000 -0.280000 -0.250000
|
||||
v 0.035355 -0.500000 0.035355
|
||||
v 0.035355 -0.300000 0.035355
|
||||
v -0.035355 -0.500000 -0.035355
|
||||
v -0.035355 -0.300000 -0.035355
|
||||
v 0.035355 -0.500000 -0.035355
|
||||
v 0.035355 -0.300000 -0.035355
|
||||
v -0.035355 -0.500000 0.035355
|
||||
v -0.035355 -0.300000 0.035355
|
||||
v -0.091506 -0.280000 0.341506
|
||||
v -0.341506 -0.280000 -0.091506
|
||||
v 0.000000 -0.280000 0.000000
|
||||
v 0.341506 -0.280000 -0.091506
|
||||
v 0.091506 -0.280000 0.341506
|
||||
vn -0.0000 1.0000 -0.0000
|
||||
vn -0.7071 -0.0000 0.7071
|
||||
vn 0.7071 -0.0000 0.7071
|
||||
vt 0.500000 0.437500
|
||||
vt 1.000000 0.937500
|
||||
vt 0.000000 0.937500
|
||||
vt 0.437500 0.062500
|
||||
vt 0.562500 0.062500
|
||||
vt 0.562500 0.437500
|
||||
vt 0.437500 0.437500
|
||||
s 0
|
||||
usemtl Material.001
|
||||
f 2/1/1 4/2/1 3/3/1
|
||||
f 5/4/2 6/5/2 8/6/2 7/7/2
|
||||
f 9/4/3 10/5/3 12/6/3 11/7/3
|
||||
f 1/1/1 14/2/1 13/3/1
|
||||
f 15/1/1 17/2/1 16/3/1
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
# Blender 3.6.7
|
||||
# www.blender.org
|
||||
mtllib mcl_clover_4leaf.mtl
|
||||
o Plane
|
||||
v -0.250000 -0.280000 0.250000
|
||||
v 0.250000 -0.280000 0.250000
|
||||
v -0.250000 -0.280000 -0.250000
|
||||
v 0.250000 -0.280000 -0.250000
|
||||
v 0.035355 -0.500000 0.035355
|
||||
v 0.035355 -0.300000 0.035355
|
||||
v -0.035355 -0.500000 -0.035355
|
||||
v -0.035355 -0.300000 -0.035355
|
||||
v 0.035355 -0.500000 -0.035355
|
||||
v 0.035355 -0.300000 -0.035355
|
||||
v -0.035355 -0.500000 0.035355
|
||||
v -0.035355 -0.300000 0.035355
|
||||
vn -0.0000 1.0000 -0.0000
|
||||
vn -0.7071 -0.0000 0.7071
|
||||
vn 0.7071 -0.0000 0.7071
|
||||
vt 0.000000 0.125000
|
||||
vt 0.875000 0.125000
|
||||
vt 0.875000 1.000000
|
||||
vt 0.000000 1.000000
|
||||
vt 0.875000 0.000000
|
||||
vt 1.000000 0.000000
|
||||
vt 1.000000 0.375000
|
||||
vt 0.875000 0.375000
|
||||
s 0
|
||||
usemtl Material.001
|
||||
f 1/1/1 2/2/1 4/3/1 3/4/1
|
||||
f 5/5/2 6/6/2 8/7/2 7/8/2
|
||||
f 9/5/3 10/6/3 12/7/3 11/8/3
|
||||
|
|
@ -399,27 +399,6 @@ minetest.register_craft({
|
|||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_mangrove:mangrove_wood 4",
|
||||
recipe = {
|
||||
{"mcl_mangrove:mangrove_tree_bark"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_mangrove:mangrove_wood 4",
|
||||
recipe = {
|
||||
{"mcl_mangrove:mangrove_stripped"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "mcl_mangrove:mangrove_wood 4",
|
||||
recipe = {
|
||||
{"mcl_mangrove:mangrove_stripped_bark"},
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
type = "fuel",
|
||||
recipe = "group:fence_wood",
|
||||
|
|
|
|||
|
|
@ -145,52 +145,6 @@ local function drink_milk(itemstack, player, pointed_thing)
|
|||
return bucket
|
||||
end
|
||||
|
||||
local function drink_milk_delayed(itemstack, player, pointed_thing)
|
||||
|
||||
if pointed_thing.type == "node" then
|
||||
local node = minetest.get_node(pointed_thing.under)
|
||||
if player and not player:get_player_control().sneak then
|
||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, player, itemstack) or itemstack
|
||||
end
|
||||
end
|
||||
elseif pointed_thing.type == "object" then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local function drink_milk(itemstack, player, pointed_thing)
|
||||
--local bucket = minetest.do_item_eat(0, "mcl_buckets:bucket_empty", itemstack, player, pointed_thing)
|
||||
-- Check if we were allowed to drink this (eat delay check)
|
||||
--if mcl_hunger.active and (bucket:get_name() ~= "mcl_mobitems:milk_bucket" or minetest.is_creative_enabled(player:get_player_name())) then
|
||||
if mcl_hunger.active and (player:get_inventory():get_stack("main", player:get_wield_index(), itemstack) == "mcl_mobitems:milk_bucket" or minetest.is_creative_enabled(player:get_player_name())) then
|
||||
mcl_hunger.stop_poison(player)
|
||||
end
|
||||
mcl_potions._reset_player_effects(player)
|
||||
return bucket
|
||||
end
|
||||
|
||||
-- Wrapper for handling mcl_hunger delayed eating
|
||||
local name = player:get_player_name()
|
||||
mcl_hunger.eat_internal[name]._custom_itemstack = itemstack -- Used as comparison to make sure the custom wrapper executes only when the same item is eaten
|
||||
mcl_hunger.eat_internal[name]._custom_var = {
|
||||
itemstack = itemstack,
|
||||
player = player,
|
||||
pointed_thing = pointed_thing,
|
||||
}
|
||||
mcl_hunger.eat_internal[name]._custom_func = drink_milk
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper = function(name)
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_func(
|
||||
mcl_hunger.eat_internal[name]._custom_var.itemstack,
|
||||
mcl_hunger.eat_internal[name]._custom_var.player,
|
||||
mcl_hunger.eat_internal[name]._custom_var.pointed_thing
|
||||
)
|
||||
end
|
||||
|
||||
--mcl_hunger.eat_internal[name]._custom_do_delayed = true -- Only _custom_wrapper will be executed after holding RMB or LMB within a specified delay
|
||||
minetest.do_item_eat(0, "mcl_buckets:bucket_empty", itemstack, player, pointed_thing)
|
||||
end
|
||||
|
||||
minetest.register_craftitem("mcl_mobitems:milk_bucket", {
|
||||
description = S("Milk"),
|
||||
_tt_help = minetest.colorize(mcl_colors.GREEN, S("Removes all status effects")),
|
||||
|
|
@ -198,10 +152,8 @@ minetest.register_craftitem("mcl_mobitems:milk_bucket", {
|
|||
_doc_items_usagehelp = S("Use the placement key to drink the milk."),
|
||||
inventory_image = "mcl_mobitems_bucket_milk.png",
|
||||
wield_image = "mcl_mobitems_bucket_milk.png",
|
||||
--on_place = drink_milk, -- Will do effect immediately but not reduce item count until eating delay ends which makes it exploitable by deliberately not finishing delay
|
||||
--on_secondary_use = drink_milk,
|
||||
on_place = drink_milk_delayed,
|
||||
on_secondary_use = drink_milk_delayed,
|
||||
on_place = drink_milk,
|
||||
on_secondary_use = drink_milk,
|
||||
stack_max = 1,
|
||||
groups = { food = 3, can_eat_when_full = 1 },
|
||||
})
|
||||
|
|
@ -346,7 +298,7 @@ minetest.register_craftitem("mcl_mobitems:rabbit_stew", {
|
|||
stack_max = 1,
|
||||
on_place = minetest.item_eat(10, "mcl_core:bowl"),
|
||||
on_secondary_use = minetest.item_eat(10, "mcl_core:bowl"),
|
||||
groups = { food = 2, eatable = 10 },
|
||||
groups = { food = 3, eatable = 10 },
|
||||
_mcl_saturation = 12.0,
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Rotten Flesh=Chair putréfiée
|
||||
80% chance of food poisoning=80% de chances d'intoxication alimentaire
|
||||
|
||||
Yuck! This piece of flesh clearly has seen better days. If you're really desperate, you can eat it to restore a few hunger points, but there's a 80% chance it causes food poisoning, which increases your hunger for a while.=Beurk ! Ce morceau de chair a clairement connu des jours meilleurs. Si vous êtes vraiment désespéré, vous pouvez le manger pour restaurer quelques points de faim, mais il y a 80% de chances qu'il provoque une intoxication alimentaire, ce qui augmente votre faim pendant un certain temps.
|
||||
Yuck! This piece of flesh clearly has seen better days. If you're really desperate, you can eat it to restore a few hunger points, but there's a 80% chance it causes food poisoning, which increases your hunger for a while.=Beurk! Ce morceau de chair a clairement connu des jours meilleurs. Si vous êtes vraiment désespéré, vous pouvez le manger pour restaurer quelques points de faim, mais il y a 80% de chances qu'il provoque une intoxication alimentaire, ce qui augmente votre faim pendant un certain temps.
|
||||
|
||||
Raw Mutton=Mouton cru
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ Raw mutton is the flesh from a sheep and can be eaten safely. Cooking it will gr
|
|||
|
||||
Cooked Mutton=Mouton cuit
|
||||
Cooked mutton is the cooked flesh from a sheep and is used as food.=Le mouton cuit est la chair cuite d'un mouton et est utilisé comme nourriture.
|
||||
Raw Beef=Boeuf cru
|
||||
Raw Beef=Boeuf Cru
|
||||
|
||||
Raw beef is the flesh from cows and can be eaten safely. Cooking it will greatly increase its nutritional value.=Le boeuf cru est la chair des vaches et peut être mangé en toute sécurité. La cuisson augmentera considérablement sa valeur nutritive.
|
||||
|
||||
|
|
@ -23,25 +23,25 @@ Raw chicken is a food item which is not safe to consume. You can eat it to resto
|
|||
|
||||
Cooked Chicken=Poulet cuit
|
||||
A cooked chicken is a healthy food item which can be eaten.=Un poulet cuit est un aliment sain qui peut être mangé.
|
||||
Raw Porkchop=Porc cru
|
||||
Raw Porkchop=Porc Cru
|
||||
|
||||
A raw porkchop is the flesh from a pig and can be eaten safely. Cooking it will greatly increase its nutritional value.=Un porc cru est la chair d'un porc et peut être mangée en toute sécurité. La cuisson augmentera considérablement sa valeur nutritive.
|
||||
|
||||
Cooked Porkchop=Porc cuit
|
||||
Cooked porkchop is the cooked flesh of a pig and is used as food.=Le porc cuit est la chair cuite d'un porc et est utilisé comme aliment.
|
||||
Raw Rabbit=Lapin cru
|
||||
Raw Rabbit=Lapin Cru
|
||||
|
||||
Raw rabbit is a food item from a dead rabbit. It can be eaten safely. Cooking it will increase its nutritional value.=Le lapin cru est un aliment provenant d'un lapin mort. Il peut être mangé en toute sécurité. La cuisson augmentera sa valeur nutritive.
|
||||
|
||||
Cooked Rabbit=Lapin cuit
|
||||
This is a food item which can be eaten.=Il s'agit d'un aliment qui peut être mangé.
|
||||
Milk=Lait
|
||||
Removes all status effects=Supprime tous les effets de statut !
|
||||
Removes all status effects=Supprime tous les effets de statut!
|
||||
|
||||
Milk is very refreshing and can be obtained by using a bucket on a cow. Drinking it will remove all status effects, but restores no hunger points.=Le lait est très rafraîchissant et peut être obtenu en utilisant un seau sur une vache. Le boire supprimera tous les effets de statut, mais ne restaure aucun point de faim.
|
||||
|
||||
Use the placement key to drink the milk.=Utilisez la touche de placement pour boire le lait.
|
||||
Spider Eye=Oeil d'araignée
|
||||
Spider Eye=Œil d'araignée
|
||||
Poisonous=Toxique
|
||||
|
||||
Spider eyes are used mainly in crafting. If you're really desperate, you can eat a spider eye, but it will poison you briefly.=Les yeux d'araignée sont utilisés principalement dans l'artisanat. Si vous êtes vraiment désespéré, vous pouvez manger un œil d'araignée, mais cela vous empoisonnera brièvement.
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ minetest.register_craftitem("mcl_mushrooms:mushroom_stew", {
|
|||
inventory_image = "farming_mushroom_stew.png",
|
||||
on_place = minetest.item_eat(6, "mcl_core:bowl"),
|
||||
on_secondary_use = minetest.item_eat(6, "mcl_core:bowl"),
|
||||
groups = { food = 2, eatable = 6 },
|
||||
groups = { food = 3, eatable = 6 },
|
||||
_mcl_saturation = 7.2,
|
||||
stack_max = 1,
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,7 +7,7 @@ Missing effect parameter!=Paramètre d'effet manquant!
|
|||
Missing or invalid duration parameter!=Paramètre durée manquant ou invalide!
|
||||
Invalid factor parameter!=Paramètre facteur invalide!
|
||||
@1 is not an available status effect.=@1 n'est pas un effet disponible.
|
||||
Fermented Spider Eye=Oeil d'araignée fermenté
|
||||
Fermented Spider Eye=Œil d'araignée fermenté
|
||||
Glass Bottle=Bouteille en verre
|
||||
Liquid container=Récipient de liquide
|
||||
|
||||
|
|
|
|||
|
|
@ -61,26 +61,7 @@ function return_on_use(def, effect, dur)
|
|||
return itemstack
|
||||
end
|
||||
|
||||
--def.on_use(user, effect, dur) -- Will do effect immediately but not reduce item count until eating delay ends which makes it exploitable by deliberately not finishing delay
|
||||
|
||||
-- Wrapper for handling mcl_hunger delayed eating
|
||||
local name = user:get_player_name()
|
||||
mcl_hunger.eat_internal[name]._custom_itemstack = itemstack -- Used as comparison to make sure the custom wrapper executes only when the same item is eaten
|
||||
mcl_hunger.eat_internal[name]._custom_var = {
|
||||
user = user,
|
||||
effect = effect,
|
||||
dur = dur,
|
||||
}
|
||||
mcl_hunger.eat_internal[name]._custom_func = def.on_use
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper = function(name)
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_func(
|
||||
mcl_hunger.eat_internal[name]._custom_var.user,
|
||||
mcl_hunger.eat_internal[name]._custom_var.effect,
|
||||
mcl_hunger.eat_internal[name]._custom_var.dur
|
||||
)
|
||||
end
|
||||
|
||||
def.on_use(user, effect, dur)
|
||||
local old_name, old_count = itemstack:get_name(), itemstack:get_count()
|
||||
itemstack = minetest.do_item_eat(0, "mcl_potions:glass_bottle", itemstack, user, pointed_thing)
|
||||
if old_name ~= itemstack:get_name() or old_count ~= itemstack:get_count() then
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@
|
|||
--- DateTime: 10/14/22 4:05 PM
|
||||
---
|
||||
|
||||
--local logging = minetest.settings:get_bool("mcl_logging_mcl_signs",true)
|
||||
|
||||
local DEBUG = minetest.settings:get_bool("mcl_logging_mcl_signs", false) -- special debug setting.
|
||||
|
||||
if DEBUG then
|
||||
minetest.log("action", "[mcl_signs] Signs API Loading")
|
||||
end
|
||||
|
|
@ -112,6 +115,9 @@ mcl_signs.registered_signs = {}
|
|||
mcl_signs.registered_signs.wall_signs = {}
|
||||
mcl_signs.registered_signs.standing_signs = {}
|
||||
mcl_signs.registered_signs.hanging_signs = {} -- unused. prepping for future use.
|
||||
-- DEFINE SIGN BASE TYPES
|
||||
mcl_signs.wall_standard = {} -- initialize
|
||||
mcl_signs.standing_standard = {} -- initialize
|
||||
|
||||
function mcl_signs.build_signs_info()
|
||||
local n = 23 / 56 - 1 / 128 -- some required magic number from the original code.
|
||||
|
|
@ -135,110 +141,37 @@ function mcl_signs.build_signs_info()
|
|||
|
||||
end
|
||||
|
||||
-- DEFINE SIGN BASE TYPES
|
||||
local common_definition = {
|
||||
_mcl_hardness = 1,
|
||||
_mcl_blast_resistance = 1,
|
||||
stack_max = 16,
|
||||
sounds = node_sounds,
|
||||
groups = mcl_signs.sign_groups,
|
||||
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
|
||||
drawtype = "mesh",
|
||||
paramtype = "light",
|
||||
tiles = { "mcl_signs_sign.png" },
|
||||
sunlight_propagates = true,
|
||||
-- wall signs' & hanging signs' base (definition)
|
||||
mcl_signs.wall_standard = {
|
||||
description = S("Sign"),
|
||||
_tt_help = S("Can be written"),
|
||||
_doc_items_longdesc = S("Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them."),
|
||||
_doc_items_usagehelp = S("After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow."),
|
||||
inventory_image = "mcl_signs_default_sign.png",
|
||||
walkable = false,
|
||||
is_ground_content = false,
|
||||
wield_image = "mcl_signs_default_sign.png",
|
||||
node_placement_prediction = "",
|
||||
paramtype = "light",
|
||||
sunlight_propagates = true,
|
||||
paramtype2 = "wallmounted",
|
||||
drawtype = "mesh",
|
||||
mesh = "mcl_signs_signonwallmount.obj",
|
||||
selection_box = { type = "wallmounted", wall_side = { -0.5, -7 / 28, -0.5, -23 / 56, 7 / 28, 0.5 } },
|
||||
tiles = { "mcl_signs_sign.png" },
|
||||
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
|
||||
groups = mcl_signs.sign_groups,
|
||||
stack_max = 16,
|
||||
sounds = node_sounds,
|
||||
|
||||
on_rightclick = function (pos, node, clicker, itemstack, pointed_thing)
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Right Click event.")
|
||||
end
|
||||
|
||||
-- make sure player is clicking
|
||||
if not clicker or not clicker:is_player() then
|
||||
return
|
||||
end
|
||||
|
||||
local item = clicker:get_wielded_item()
|
||||
local iname = item:get_name()
|
||||
|
||||
local protected = mcl_util.check_position_protection(pos, clicker)
|
||||
|
||||
if node and not protected then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Right Click event on valid node.")
|
||||
end
|
||||
|
||||
-- handle glow from glow_ink_sac *first*
|
||||
if (iname == "mcl_mobitems:glow_ink_sac") then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:glow_sign(pos)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Glow Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- check the wielded item to make sure that it is a dye.
|
||||
local txt_color = mcl_signs:get_color_for_sign(iname)
|
||||
if txt_color ~= "false" then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:color_sign(pos, txt_color)
|
||||
-- "mcl_dye:black" is a special case: it makes the sign's lettering black AND removes glow.
|
||||
if (iname == "mcl_dye:black") then
|
||||
success = mcl_signs:glow_sign(pos, true)
|
||||
if success and DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Glow removal Success.")
|
||||
end
|
||||
end
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Color Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- No modifier item in hand, open the sign for edition
|
||||
local old_text = minetest.get_meta(pos):get_string("text")
|
||||
mcl_signs:show_formspec(clicker, pos, old_text)
|
||||
end
|
||||
end,
|
||||
|
||||
on_destruct = function(pos)
|
||||
mcl_signs:destruct_sign(pos)
|
||||
end,
|
||||
|
||||
-- Not Useless Code. this force updates the sign.
|
||||
on_punch = function(pos, node, puncher)
|
||||
mcl_signs:update_sign(pos)
|
||||
end,
|
||||
}
|
||||
|
||||
-- wall signs' & hanging signs' base (definition)
|
||||
mcl_signs.wall_standard = table.copy(common_definition)
|
||||
mcl_signs.wall_standard.description = S("Sign")
|
||||
mcl_signs.wall_standard._tt_help = S("Can be written")
|
||||
mcl_signs.wall_standard._doc_items_longdesc = S("Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.")
|
||||
mcl_signs.wall_standard._doc_items_usagehelp = S("After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.")
|
||||
mcl_signs.wall_standard.inventory_image = "mcl_signs_default_sign.png"
|
||||
mcl_signs.wall_standard.wield_image = "mcl_signs_default_sign.png"
|
||||
mcl_signs.wall_standard.node_placement_prediction = ""
|
||||
mcl_signs.wall_standard.paramtype2 = "wallmounted"
|
||||
mcl_signs.wall_standard.mesh = "mcl_signs_signonwallmount.obj"
|
||||
mcl_signs.wall_standard.selection_box = { type = "wallmounted", wall_side = { -0.5, -7 / 28, -0.5, -23 / 56, 7 / 28, 0.5 } }
|
||||
mcl_signs.wall_standard.on_timer = function(pos)
|
||||
on_timer = function(pos)
|
||||
-- fix for /ClearObjects
|
||||
mcl_signs:update_sign(pos)
|
||||
-- note: update_sign decides to keep the timer running based on if there is text.
|
||||
-- This prevents every sign from having a timer, when not needed.
|
||||
end
|
||||
mcl_signs.wall_standard.on_place = function(itemstack, placer, pointed_thing)
|
||||
end,
|
||||
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
local above = pointed_thing.above
|
||||
local under = pointed_thing.under
|
||||
|
||||
|
|
@ -259,6 +192,9 @@ mcl_signs.wall_standard.on_place = function(itemstack, placer, pointed_thing)
|
|||
end
|
||||
|
||||
local wdir = minetest.dir_to_wallmounted(dir)
|
||||
|
||||
--local placer_pos = placer:get_pos()
|
||||
|
||||
local fdir = minetest.dir_to_facedir(dir)
|
||||
|
||||
local sign_info
|
||||
|
|
@ -336,10 +272,18 @@ mcl_signs.wall_standard.on_place = function(itemstack, placer, pointed_thing)
|
|||
|
||||
minetest.sound_play({ name = "default_place_node_hard", gain = 1.0 }, { pos = place_pos }, true)
|
||||
|
||||
mcl_signs:show_formspec(placer, place_pos, "")
|
||||
mcl_signs:show_formspec(placer, place_pos)
|
||||
return itemstack
|
||||
end
|
||||
mcl_signs.wall_standard.on_rotate = function(pos, node, user, mode)
|
||||
end,
|
||||
on_destruct = function(pos)
|
||||
mcl_signs:destruct_sign(pos)
|
||||
end,
|
||||
|
||||
-- Not Useless Code. force updates the sign.
|
||||
on_punch = function(pos, node, puncher)
|
||||
mcl_signs:update_sign(pos)
|
||||
end,
|
||||
on_rotate = function(pos, node, user, mode)
|
||||
if mode == screwdriver.ROTATE_FACE then
|
||||
local r = screwdriver.rotate.wallmounted(pos, node, mode)
|
||||
node.param2 = r
|
||||
|
|
@ -349,21 +293,105 @@ mcl_signs.wall_standard.on_rotate = function(pos, node, user, mode)
|
|||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
end,
|
||||
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Wall_Sign Right Click event.")
|
||||
end
|
||||
|
||||
-- make sure player is clicking
|
||||
if not clicker or not clicker:is_player() then
|
||||
return
|
||||
end
|
||||
|
||||
local item = clicker:get_wielded_item()
|
||||
local iname = item:get_name()
|
||||
|
||||
local protected = mcl_util.check_position_protection(pos, clicker)
|
||||
|
||||
if node and not protected then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Wall_Sign Right Click event on valid node.")
|
||||
end
|
||||
|
||||
-- handle glow from glow_ink_sac *first*
|
||||
if (iname == "mcl_mobitems:glow_ink_sac") then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:glow_sign(pos)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Glow Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- "mcl_dye:black" is a special case: it makes the sign's lettering black AND removes glow.
|
||||
if (iname == "mcl_dye:black") then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:glow_sign(pos, true)
|
||||
mcl_signs:color_sign(pos, mcl_colors.BLACK)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Glow removal Success.")
|
||||
end
|
||||
|
||||
itemstack:take_item()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- check the wielded item to make sure that it is a dye.
|
||||
local txt_color = mcl_signs:get_color_for_sign(iname)
|
||||
if txt_color ~= "false" then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:color_sign(pos, txt_color)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Color Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
_mcl_hardness = 1,
|
||||
_mcl_blast_resistance = 1,
|
||||
}
|
||||
-- standing sign base (definition)
|
||||
mcl_signs.standing_standard = table.copy(common_definition)
|
||||
mcl_signs.standing_standard.paramtype2 = "facedir"
|
||||
mcl_signs.standing_standard.mesh = "mcl_signs_sign.obj"
|
||||
mcl_signs.standing_standard.selection_box = { type = "fixed", fixed = { -0.2, -0.5, -0.2, 0.2, 0.5, 0.2 } }
|
||||
mcl_signs.standing_standard.drop = "mcl_signs:wall_sign"
|
||||
mcl_signs.standing_standard.on_timer = function(pos)
|
||||
mcl_signs.standing_standard = {
|
||||
paramtype = "light",
|
||||
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "opaque" or false,
|
||||
sunlight_propagates = true,
|
||||
walkable = false,
|
||||
is_ground_content = false,
|
||||
paramtype2 = "facedir",
|
||||
drawtype = "mesh",
|
||||
mesh = "mcl_signs_sign.obj",
|
||||
selection_box = { type = "fixed", fixed = { -0.2, -0.5, -0.2, 0.2, 0.5, 0.2 } },
|
||||
tiles = { "mcl_signs_sign.png" },
|
||||
groups = mcl_signs.sign_groups,
|
||||
drop = "mcl_signs:wall_sign",
|
||||
stack_max = 16,
|
||||
sounds = node_sounds,
|
||||
|
||||
on_destruct = function(pos)
|
||||
mcl_signs:destruct_sign(pos)
|
||||
end,
|
||||
|
||||
on_timer = function(pos)
|
||||
-- fix for /ClearObjects
|
||||
mcl_signs:update_sign(pos)
|
||||
minetest.get_node_timer(pos):start(40.0)
|
||||
end
|
||||
mcl_signs.standing_standard.on_rotate = function(pos, node, user, mode)
|
||||
end,
|
||||
|
||||
-- Not Useless Code. this force updates the sign.
|
||||
on_punch = function(pos, node, puncher)
|
||||
mcl_signs:update_sign(pos)
|
||||
end,
|
||||
on_rotate = function(pos, node, user, mode)
|
||||
if mode == screwdriver.ROTATE_FACE then
|
||||
node.name = "mcl_signs:standing_sign22_5"
|
||||
minetest.swap_node(pos, node)
|
||||
|
|
@ -372,7 +400,60 @@ mcl_signs.standing_standard.on_rotate = function(pos, node, user, mode)
|
|||
end
|
||||
mcl_signs:update_sign(pos, nil, nil, true)
|
||||
return true
|
||||
end
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
|
||||
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Standing_Sign Right Click event.")
|
||||
end
|
||||
|
||||
-- make sure player is clicking
|
||||
if not clicker or not clicker:is_player() then
|
||||
return
|
||||
end
|
||||
|
||||
local item = clicker:get_wielded_item()
|
||||
local iname = item:get_name()
|
||||
|
||||
local protected = mcl_util.check_position_protection(pos, clicker)
|
||||
|
||||
if node and not protected then
|
||||
-- handle glow from glow_ink_sac *first*
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Standing_Sign Right Click event on valid node.")
|
||||
end
|
||||
|
||||
if (iname == "mcl_mobitems:glow_ink_sac") then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:glow_sign(pos)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Glow Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- check the wielded item to make sure that it is a dye.
|
||||
local txt_color = mcl_signs:get_color_for_sign(iname)
|
||||
if txt_color ~= "false" then
|
||||
clicker:set_wielded_item(item)
|
||||
local success = mcl_signs:color_sign(pos, txt_color)
|
||||
if success then
|
||||
if DEBUG then
|
||||
minetest.log("verbose", "[mcl_signs] Sign Color Success.")
|
||||
end
|
||||
itemstack:take_item()
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
|
||||
_mcl_hardness = 1,
|
||||
_mcl_blast_resistance = 1,
|
||||
}
|
||||
|
||||
-- HELPER FUNCTIONS' VARIABLES
|
||||
local sign_glow = 6
|
||||
|
|
@ -582,7 +663,7 @@ function mcl_signs.register_sign (modname, color, _name, ttsign)
|
|||
|
||||
minetest.sound_play({ name = "default_place_node_hard", gain = 1.0 }, { pos = place_pos }, true)
|
||||
|
||||
mcl_signs:show_formspec(placer, place_pos, "")
|
||||
mcl_signs:show_formspec(placer, place_pos)
|
||||
return itemstack
|
||||
end
|
||||
|
||||
|
|
@ -835,7 +916,7 @@ function mcl_signs.register_sign_custom (modname, _name, tiles, color, inventory
|
|||
|
||||
minetest.sound_play({ name = "default_place_node_hard", gain = 1.0 }, { pos = place_pos }, true)
|
||||
|
||||
mcl_signs:show_formspec(placer, place_pos, "")
|
||||
mcl_signs:show_formspec(placer, place_pos)
|
||||
return itemstack
|
||||
end
|
||||
minetest.register_node(":mcl_signs:wall_sign" .. _name, new_sign)
|
||||
|
|
@ -1071,7 +1152,7 @@ function mcl_signs.reregister_sign (modname, color, _name, ttsign)
|
|||
|
||||
minetest.sound_play({ name = "default_place_node_hard", gain = 1.0 }, { pos = place_pos }, true)
|
||||
|
||||
mcl_signs:show_formspec(placer, place_pos, "")
|
||||
mcl_signs:show_formspec(placer, place_pos)
|
||||
return itemstack
|
||||
end
|
||||
|
||||
|
|
@ -1320,7 +1401,7 @@ function mcl_signs.reregister_sign_custom (modname, _name, tiles, color, invento
|
|||
|
||||
minetest.sound_play({ name = "default_place_node_hard", gain = 1.0 }, { pos = place_pos }, true)
|
||||
|
||||
mcl_signs:show_formspec(placer, place_pos, "")
|
||||
mcl_signs:show_formspec(placer, place_pos)
|
||||
return itemstack
|
||||
end
|
||||
minetest.override_item("mcl_signs:wall_sign" .. _name, new_sign)
|
||||
|
|
@ -1802,7 +1883,7 @@ function mcl_signs:update_sign(pos, fields, sender, force_remove, text_color)
|
|||
return false
|
||||
end
|
||||
local text = meta:get_string("text", "")
|
||||
if fields and fields.text then
|
||||
if fields and (text == "" and fields.text) then
|
||||
meta:set_string("text", fields.text)
|
||||
text = fields.text
|
||||
end
|
||||
|
|
@ -1959,13 +2040,11 @@ function mcl_signs:update_sign(pos, fields, sender, force_remove, text_color)
|
|||
|
||||
end
|
||||
|
||||
function mcl_signs:show_formspec(player, pos, old_text)
|
||||
function mcl_signs:show_formspec(player, pos)
|
||||
minetest.show_formspec(
|
||||
player:get_player_name(),
|
||||
"mcl_signs:set_text_" .. pos.x .. "_" .. pos.y .. "_" .. pos.z,
|
||||
"size[6,3]textarea[0.25,0.25;6,1.5;text;" .. F(S("Enter sign text:")) .. ";".. F(old_text) .. "]" ..
|
||||
"label[0,1.5;" .. F(S("Maximum line length: 15")) ..
|
||||
"\n" .. F(S("Maximum lines: 4")) .. "]button_exit[0,2.5;6,1;submit;" .. F(S("Done")) .. "]"
|
||||
"size[6,3]textarea[0.25,0.25;6,1.5;text;" .. F(S("Enter sign text:")) .. ";]label[0,1.5;" .. F(S("Maximum line length: 15")) .. "\n" .. F(S("Maximum lines: 4")) .. "]button_exit[0,2.5;6,1;submit;" .. F(S("Done")) .. "]"
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -78,50 +78,6 @@ local function eat_stew(itemstack, user, pointed_thing)
|
|||
end
|
||||
end
|
||||
|
||||
local function eat_stew_delayed(itemstack, user, pointed_thing)
|
||||
|
||||
if pointed_thing.type == "node" then
|
||||
if user and not user:get_player_control().sneak then
|
||||
-- Use pointed node's on_rightclick function first, if present
|
||||
local node = minetest.get_node(pointed_thing.under)
|
||||
if user and not user:get_player_control().sneak then
|
||||
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
|
||||
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack) or itemstack
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif pointed_thing.type == "object" then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
-- Wrapper for handling mcl_hunger delayed eating
|
||||
local name = user:get_player_name()
|
||||
mcl_hunger.eat_internal[name]._custom_itemstack = itemstack -- Used as comparison to make sure the custom wrapper executes only when the same item is eaten
|
||||
mcl_hunger.eat_internal[name]._custom_var = {
|
||||
itemstack = itemstack,
|
||||
user = user,
|
||||
pointed_thing = pointed_thing,
|
||||
}
|
||||
mcl_hunger.eat_internal[name]._custom_func = eat_stew
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper = function(name)
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_func(
|
||||
mcl_hunger.eat_internal[name]._custom_var.itemstack,
|
||||
mcl_hunger.eat_internal[name]._custom_var.user,
|
||||
mcl_hunger.eat_internal[name]._custom_var.pointed_thing
|
||||
)
|
||||
|
||||
local user = mcl_hunger.eat_internal[name]._custom_var.user
|
||||
|
||||
minetest.after(0, function()
|
||||
user:get_inventory():set_stack("main", user:get_wield_index(), "mcl_core:bowl")
|
||||
end)
|
||||
end
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_do_delayed = true -- Only _custom_wrapper will be executed after holding RMB or LMB within a specified delay
|
||||
--minetest.do_item_eat(0, "mcl_core:bowl", itemstack, user, pointed_thing)
|
||||
end
|
||||
|
||||
minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
|
||||
if itemstack:get_name() ~= "mcl_sus_stew:stew" then return end
|
||||
for f,e in pairs(flower_effect) do
|
||||
|
|
@ -140,10 +96,8 @@ minetest.register_craftitem("mcl_sus_stew:stew",{
|
|||
description = S("Suspicious Stew"),
|
||||
inventory_image = "sus_stew.png",
|
||||
stack_max = 1,
|
||||
--on_place = eat_stew,
|
||||
--on_secondary_use = eat_stew,
|
||||
on_place = eat_stew_delayed,
|
||||
on_secondary_use = eat_stew_delayed,
|
||||
on_place = eat_stew,
|
||||
on_secondary_use = eat_stew,
|
||||
groups = { food = 2, eatable = 4, can_eat_when_full = 1, not_in_creative_inventory=1,},
|
||||
_mcl_saturation = 7.2,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5186,7 +5186,7 @@ local function register_decorations()
|
|||
y_min = 1,
|
||||
y_max = mcl_vars.mg_overworld_max,
|
||||
decoration = "mcl_farming:melon",
|
||||
biomes = {"Jungle", "BambooJungle"},
|
||||
biomes = {"Jungle"},
|
||||
})
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
|
|
@ -5203,7 +5203,7 @@ local function register_decorations()
|
|||
y_min = 1,
|
||||
y_max = mcl_vars.mg_overworld_max,
|
||||
decoration = "mcl_farming:melon",
|
||||
biomes = {"JungleM", "BambooJungleM"},
|
||||
biomes = {"JungleM"},
|
||||
})
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
|
|
@ -5220,7 +5220,7 @@ local function register_decorations()
|
|||
y_min = 1,
|
||||
y_max = mcl_vars.mg_overworld_max,
|
||||
decoration = "mcl_farming:melon",
|
||||
biomes = {"JungleEdge", "JungleEdgeM", "BambooJungleEdge", "BambooJungleEdgeM"},
|
||||
biomes = {"JungleEdge", "JungleEdgeM"},
|
||||
})
|
||||
|
||||
-- Lots of melons in Jungle Edge M
|
||||
|
|
@ -5260,7 +5260,6 @@ local function register_decorations()
|
|||
},
|
||||
y_min = 1,
|
||||
y_max = mcl_vars.mg_overworld_max,
|
||||
biomes = {"ExtremeHills", "ExtremeHillsM", "ExtremeHills+", "Taiga", "MegaTaiga", "MegaSpruceTaiga", "Plains", "SunflowerPlains", "Swampland", "MangroveSwamp"},
|
||||
})
|
||||
|
||||
-- Grasses and ferns
|
||||
|
|
@ -5590,7 +5589,7 @@ local function register_decorations()
|
|||
num_spawn_by = 1,
|
||||
})
|
||||
end
|
||||
local function register_flower(name, biomes, seed, is_in_flower_forest, custom_rarity_mod)
|
||||
local function register_flower(name, biomes, seed, is_in_flower_forest)
|
||||
if is_in_flower_forest == nil then
|
||||
is_in_flower_forest = true
|
||||
end
|
||||
|
|
@ -5600,7 +5599,7 @@ local function register_decorations()
|
|||
place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
|
||||
sidelen = 16,
|
||||
noise_params = {
|
||||
offset = 0.0008 + (custom_rarity_mod or 0),
|
||||
offset = 0.0008,
|
||||
scale = 0.006,
|
||||
spread = {x = 100, y = 100, z = 100},
|
||||
seed = seed,
|
||||
|
|
@ -5652,9 +5651,6 @@ local function register_decorations()
|
|||
|
||||
register_flower("lily_of_the_valley", nil, 325)
|
||||
register_flower("cornflower", flower_biomes2, 486)
|
||||
|
||||
register_flower("clover", flower_biomes1, 3, false, 0.04)
|
||||
register_flower("fourleaf_clover", flower_biomes1, 13, false, -0.002)
|
||||
end
|
||||
|
||||
-- Decorations in non-Overworld dimensions
|
||||
|
|
|
|||
|
|
@ -49,7 +49,3 @@ Initial release
|
|||
- Fix mod not working with both intllib and mod security enabled
|
||||
- Add missing screenshot
|
||||
- Rewrite README and use Markdown format
|
||||
|
||||
0.6.0
|
||||
-----
|
||||
- Add eating delay
|
||||
|
|
|
|||
|
|
@ -38,26 +38,7 @@ function minetest.do_item_eat(hp_change, replace_with_item, itemstack, user, poi
|
|||
local can_eat_when_full = creative or (mcl_hunger.active == false)
|
||||
or minetest.get_item_group(itemstack:get_name(), "can_eat_when_full") == 1
|
||||
-- Don't allow eating when player has full hunger bar (some exceptional items apply)
|
||||
if not no_eat_delay and not mcl_hunger.eat_internal[name].is_eating and not mcl_hunger.eat_internal[name].do_item_eat and (can_eat_when_full or (mcl_hunger.get_hunger(user) < 20)) then
|
||||
local itemname = itemstack:get_name()
|
||||
table.update(mcl_hunger.eat_internal[name], {
|
||||
is_eating = true,
|
||||
is_eating_no_padding = true,
|
||||
itemname = itemname,
|
||||
item_definition = minetest.registered_items[itemname],
|
||||
hp_change = hp_change,
|
||||
replace_with_item = replace_with_item,
|
||||
itemstack = itemstack,
|
||||
user = user,
|
||||
pointed_thing = pointed_thing
|
||||
})
|
||||
elseif (mcl_hunger.eat_internal[name].do_item_eat or no_eat_delay) and (can_eat_when_full or (mcl_hunger.get_hunger(user) < 20)) then
|
||||
if mcl_hunger.eat_internal[name]._custom_itemstack and
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper and
|
||||
mcl_hunger.eat_internal[name]._custom_itemstack == itemstack then
|
||||
|
||||
mcl_hunger.eat_internal[name]._custom_wrapper(name)
|
||||
end
|
||||
if can_eat_when_full or (mcl_hunger.get_hunger(user) < 20) then
|
||||
itemstack = mcl_hunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
for _, callback in pairs(minetest.registered_on_item_eats) do
|
||||
local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack)
|
||||
|
|
@ -66,7 +47,6 @@ function minetest.do_item_eat(hp_change, replace_with_item, itemstack, user, poi
|
|||
end
|
||||
end
|
||||
mcl_hunger.last_eat[name] = os.time()
|
||||
user:get_inventory():set_stack("main", user:get_wield_index(), itemstack)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -149,9 +129,49 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poisontime, poiso
|
|||
--local hp = user:get_hp()
|
||||
|
||||
local pos = user:get_pos()
|
||||
local def = minetest.registered_items[itemname]
|
||||
|
||||
mcl_hunger.eat_effects(user, itemname, pos, hunger_change, def)
|
||||
-- player height
|
||||
pos.y = pos.y + 1.5
|
||||
local foodtype = minetest.get_item_group(itemname, "food")
|
||||
if foodtype == 3 then
|
||||
-- Item is a drink, only play drinking sound (no particle)
|
||||
minetest.sound_play("survival_thirst_drink", {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = 1 + math.random(-10, 10)*0.005,
|
||||
object = user,
|
||||
}, true)
|
||||
else
|
||||
-- Assume the item is a food
|
||||
-- Add eat particle effect and sound
|
||||
local def = minetest.registered_items[itemname]
|
||||
local texture = def.inventory_image
|
||||
if not texture or texture == "" then
|
||||
texture = def.wield_image
|
||||
end
|
||||
-- Special item definition field: _food_particles
|
||||
-- If false, force item to not spawn any food partiles when eaten
|
||||
if def._food_particles ~= false and texture and texture ~= "" then
|
||||
local v = user:get_velocity() or user:get_player_velocity()
|
||||
for i = 0, math.min(math.max(8, hunger_change*2), 25) do
|
||||
minetest.add_particle({
|
||||
pos = { x = pos.x, y = pos.y, z = pos.z },
|
||||
velocity = vector.add(v, { x = math.random(-1, 1), y = math.random(1, 2), z = math.random(-1, 1) }),
|
||||
acceleration = { x = 0, y = math.random(-9, -5), z = 0 },
|
||||
expirationtime = 1,
|
||||
size = math.random(1, 2),
|
||||
collisiondetection = true,
|
||||
vertical = false,
|
||||
texture = "[combine:3x3:" .. -i .. "," .. -i .. "=" .. texture,
|
||||
})
|
||||
end
|
||||
end
|
||||
minetest.sound_play("mcl_hunger_bite", {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = 1 + math.random(-10, 10)*0.005,
|
||||
object = user,
|
||||
}, true)
|
||||
end
|
||||
|
||||
if mcl_hunger.active and hunger_change then
|
||||
-- Add saturation (must be defined in item table)
|
||||
|
|
@ -206,61 +226,6 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poisontime, poiso
|
|||
end
|
||||
end
|
||||
|
||||
function mcl_hunger.eat_effects(user, itemname, pos, hunger_change, item_def, pitch)
|
||||
if user and itemname and pos and hunger_change and item_def then
|
||||
local name = user:get_player_name()
|
||||
if mcl_hunger.eat_internal[name] and mcl_hunger.eat_internal[name].do_item_eat then
|
||||
pitch = 0.95
|
||||
end
|
||||
local def = item_def
|
||||
-- player height
|
||||
pos.y = pos.y + 1.5
|
||||
local foodtype = minetest.get_item_group(itemname, "food")
|
||||
if foodtype == 3 then
|
||||
-- Item is a drink, only play drinking sound (no particle)
|
||||
minetest.sound_play("survival_thirst_drink", {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = pitch or 1 + math.random(-10, 10)*0.005,
|
||||
object = user,
|
||||
}, true)
|
||||
else
|
||||
-- Assume the item is a food
|
||||
-- Add eat particle effect and sound
|
||||
--local def = minetest.registered_items[itemname]
|
||||
local texture = def.inventory_image
|
||||
if not texture or texture == "" then
|
||||
texture = def.wield_image
|
||||
end
|
||||
-- Special item definition field: _food_particles
|
||||
-- If false, force item to not spawn any food partiles when eaten
|
||||
if def._food_particles ~= false and texture and texture ~= "" then
|
||||
local v = user:get_velocity() or user:get_player_velocity()
|
||||
for i = 0, math.min(math.max(8, hunger_change*2), 25) do
|
||||
minetest.add_particle({
|
||||
pos = { x = pos.x, y = pos.y, z = pos.z },
|
||||
velocity = vector.add(v, { x = math.random(-1, 1), y = math.random(1, 2), z = math.random(-1, 1) }),
|
||||
acceleration = { x = 0, y = math.random(-9, -5), z = 0 },
|
||||
expirationtime = 1,
|
||||
size = math.random(1, 2),
|
||||
collisiondetection = true,
|
||||
vertical = false,
|
||||
texture = "[combine:3x3:" .. -i .. "," .. -i .. "=" .. texture,
|
||||
})
|
||||
end
|
||||
end
|
||||
minetest.sound_play("mcl_hunger_bite", {
|
||||
max_hear_distance = 12,
|
||||
gain = 1.0,
|
||||
pitch = pitch or 1 + math.random(-10, 10)*0.005,
|
||||
object = user,
|
||||
}, true)
|
||||
end
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
if mcl_hunger.active then
|
||||
-- player-action based hunger changes
|
||||
minetest.register_on_dignode(function(pos, oldnode, player)
|
||||
|
|
|
|||
|
|
@ -30,10 +30,6 @@ mcl_hunger.EXHAUST_REGEN = 6000 -- Regenerate 1 HP
|
|||
mcl_hunger.EXHAUST_HUNGER = 5 -- Hunger status effect at base level.
|
||||
mcl_hunger.EXHAUST_LVL = 4000 -- at what exhaustion player saturation gets lowered
|
||||
|
||||
mcl_hunger.EATING_DELAY = tonumber(minetest.settings:get("mcl_eating_delay")) or 1.61
|
||||
mcl_hunger.EATING_WALK_SPEED = tonumber(minetest.settings:get("movement_speed_crouch")) / tonumber(minetest.settings:get("movement_speed_walk"))
|
||||
mcl_hunger.EATING_TOUCHSCREEN_DELAY_PADDING = 0.75
|
||||
|
||||
mcl_hunger.SATURATION_INIT = 5 -- Initial saturation for new/respawning players
|
||||
|
||||
-- Debug Mode. If enabled, saturation and exhaustion are shown as well.
|
||||
|
|
@ -43,53 +39,6 @@ mcl_hunger.debug = false
|
|||
-- Cooldown timers for each player, to force a short delay between consuming 2 food items
|
||||
mcl_hunger.last_eat = {}
|
||||
|
||||
-- Is player eating API
|
||||
function mcl_hunger.is_eating(name)
|
||||
local result
|
||||
if name then
|
||||
if type(name) ~= "string" then
|
||||
name = name:get_player_name()
|
||||
end
|
||||
result = mcl_hunger.eat_internal[name].is_eating_no_padding
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
-- Variables for each player, to handle delayed eating
|
||||
mcl_hunger.eat_internal = {}
|
||||
|
||||
-- Set per player internal variables for delayed eating
|
||||
minetest.register_on_joinplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
|
||||
mcl_hunger.eat_internal[name] = {
|
||||
is_eating = false,
|
||||
is_eating_no_padding = false,
|
||||
itemname = nil,
|
||||
item_definition = nil,
|
||||
hp_change = nil,
|
||||
replace_with_item = nil,
|
||||
itemstack = nil,
|
||||
user = nil,
|
||||
pointed_thing = nil,
|
||||
pitch = nil,
|
||||
do_item_eat = false,
|
||||
_custom_itemstack = nil, -- Used as comparison to make sure _custom_wrapper only executes when the same item is eaten
|
||||
_custom_var = {}, -- Variables that can be used by _custom_var and _custom_wrapper
|
||||
_custom_func = nil, -- Can be executed by _custom_wrapper
|
||||
_custom_wrapper = nil, -- Will execute alongside minetest.do_item_eat if not empty and _custom_itemstack is equal to current player itemstack
|
||||
_custom_do_delayed = false, -- If true, then will execute only _custom_wrapper after holding RMB or LMB within a delay specified by mcl_hunger.EATING_DELAY (Use to bypass minetest.do_item_eat entirely)
|
||||
}
|
||||
playerphysics.remove_physics_factor(player, "speed", "mcl_hunger:eating_speed")
|
||||
end)
|
||||
|
||||
-- Clear when player leaves
|
||||
minetest.register_on_leaveplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
|
||||
mcl_hunger.eat_internal[name] = nil
|
||||
end)
|
||||
|
||||
dofile(modpath.."/api.lua")
|
||||
dofile(modpath.."/hunger.lua")
|
||||
dofile(modpath.."/register_foods.lua")
|
||||
|
|
@ -189,35 +138,6 @@ minetest.register_on_player_hpchange(function(player, hp_change)
|
|||
end)
|
||||
|
||||
local food_tick_timers = {} -- one food_tick_timer per player, keys are the player-objects
|
||||
local eat_start_timers = {}
|
||||
local eat_tick_timers = {}
|
||||
local eat_effects_cooldown = {}
|
||||
|
||||
local function clear_eat_internal_and_timers(player, player_name)
|
||||
playerphysics.remove_physics_factor(player, "speed", "mcl_hunger:eating_speed")
|
||||
mcl_hunger.eat_internal[player_name] = {
|
||||
is_eating = false,
|
||||
is_eating_no_padding = false,
|
||||
itemname = nil,
|
||||
item_definition = nil,
|
||||
hp_change = nil,
|
||||
replace_with_item = nil,
|
||||
itemstack = nil,
|
||||
user = nil,
|
||||
pointed_thing = nil,
|
||||
pitch = nil,
|
||||
do_item_eat = false,
|
||||
_custom_itemstack = nil,
|
||||
_custom_var = {},
|
||||
_custom_func = nil,
|
||||
_custom_wrapper = nil,
|
||||
_custom_do_delayed = false,
|
||||
}
|
||||
eat_start_timers[player] = 0
|
||||
eat_tick_timers[player] = 0
|
||||
eat_effects_cooldown[player] = 0
|
||||
end
|
||||
|
||||
minetest.register_globalstep(function(dtime)
|
||||
for _,player in pairs(minetest.get_connected_players()) do
|
||||
|
||||
|
|
@ -264,109 +184,6 @@ minetest.register_globalstep(function(dtime)
|
|||
end
|
||||
|
||||
food_tick_timers[player] = food_tick_timer -- update food_tick_timer table
|
||||
|
||||
-- Eating delay code
|
||||
if mcl_hunger.eat_internal[player_name] and mcl_hunger.eat_internal[player_name].is_eating or mcl_hunger.eat_internal[player_name]._custom_do_delayed then
|
||||
mcl_hunger.eat_internal[player_name].is_eating = true
|
||||
mcl_hunger.eat_internal[player_name].is_eating_no_padding = true
|
||||
|
||||
local control = player:get_player_control()
|
||||
local inv = player:get_inventory()
|
||||
local current_itemstack = player:get_wielded_item()
|
||||
|
||||
if not eat_start_timers[player] then
|
||||
eat_start_timers[player] = 0
|
||||
end
|
||||
|
||||
eat_start_timers[player] = eat_start_timers[player] + dtime
|
||||
|
||||
if not eat_tick_timers[player] then
|
||||
eat_tick_timers[player] = 0
|
||||
end
|
||||
|
||||
if not eat_effects_cooldown[player] then
|
||||
eat_effects_cooldown[player] = 0
|
||||
end
|
||||
|
||||
if not mcl_hunger.eat_internal[player_name].pitch then
|
||||
mcl_hunger.eat_internal[player_name].pitch = 1 + math.random(-10, 10)*0.005
|
||||
end
|
||||
|
||||
-- check if holding RMB (or LMB as workaround for touchscreen)
|
||||
if (current_itemstack == mcl_hunger.eat_internal[player_name].itemstack or current_itemstack == mcl_hunger.eat_internal[player_name]._custom_itemstack) and (control.RMB or control.LMB) then
|
||||
eat_tick_timers[player] = eat_tick_timers[player] + dtime
|
||||
eat_effects_cooldown[player] = eat_effects_cooldown[player] + dtime
|
||||
|
||||
playerphysics.add_physics_factor(player, "speed", "mcl_hunger:eating_speed", mcl_hunger.EATING_WALK_SPEED)
|
||||
|
||||
if eat_effects_cooldown[player] > 0.2 then
|
||||
eat_effects_cooldown[player] = 0
|
||||
|
||||
if not mcl_hunger.eat_internal[player_name].user then
|
||||
mcl_hunger.eat_internal[player_name].user = player
|
||||
end
|
||||
|
||||
if not mcl_hunger.eat_internal[player_name].itemname then
|
||||
mcl_hunger.eat_internal[player_name].itemname = current_itemstack:get_name()
|
||||
end
|
||||
|
||||
if not mcl_hunger.eat_internal[player_name].hp_change then
|
||||
mcl_hunger.eat_internal[player_name].hp_change = 0
|
||||
end
|
||||
|
||||
local pos = player:get_pos()
|
||||
local itemname = mcl_hunger.eat_internal[player_name].itemname
|
||||
local def = minetest.registered_items[itemname]
|
||||
|
||||
mcl_hunger.eat_effects(
|
||||
mcl_hunger.eat_internal[player_name].user,
|
||||
mcl_hunger.eat_internal[player_name].itemname,
|
||||
pos,
|
||||
mcl_hunger.eat_internal[player_name].hp_change,
|
||||
def,
|
||||
mcl_hunger.eat_internal[player_name].pitch
|
||||
)
|
||||
end
|
||||
|
||||
-- check if eating delay is over
|
||||
if eat_tick_timers[player] >= mcl_hunger.EATING_DELAY then
|
||||
|
||||
if not mcl_hunger.eat_internal[player_name]._custom_do_delayed then
|
||||
mcl_hunger.eat_internal[player_name].do_item_eat = true
|
||||
|
||||
minetest.do_item_eat(
|
||||
mcl_hunger.eat_internal[player_name].hp_change,
|
||||
mcl_hunger.eat_internal[player_name].replace_with_item,
|
||||
mcl_hunger.eat_internal[player_name].itemstack,
|
||||
mcl_hunger.eat_internal[player_name].user,
|
||||
mcl_hunger.eat_internal[player_name].pointed_thing
|
||||
)
|
||||
|
||||
-- bypass minetest.do_item_eat and only execute _custom_wrapper
|
||||
elseif mcl_hunger.eat_internal[player_name]._custom_itemstack and
|
||||
mcl_hunger.eat_internal[player_name]._custom_wrapper and
|
||||
mcl_hunger.eat_internal[player_name]._custom_itemstack == current_itemstack then
|
||||
|
||||
mcl_hunger.eat_internal[player_name]._custom_wrapper(player_name)
|
||||
|
||||
player:get_inventory():set_stack("main", player:get_wield_index(), itemstack)
|
||||
end
|
||||
|
||||
clear_eat_internal_and_timers(player, player_name)
|
||||
end
|
||||
|
||||
elseif eat_start_timers[player] and eat_start_timers[player] > 0.2 then
|
||||
playerphysics.remove_physics_factor(player, "speed", "mcl_hunger:eating_speed")
|
||||
mcl_hunger.eat_internal[player_name].is_eating_no_padding = false
|
||||
|
||||
elseif eat_start_timers[player] and eat_start_timers[player] > mcl_hunger.EATING_TOUCHSCREEN_DELAY_PADDING then
|
||||
clear_eat_internal_and_timers(player, player_name)
|
||||
end
|
||||
end
|
||||
|
||||
if eat_start_timers[player] and eat_start_timers[player] > mcl_hunger.EATING_DELAY + mcl_hunger.EATING_TOUCHSCREEN_DELAY_PADDING then
|
||||
clear_eat_internal_and_timers(player, player_name)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
|
|
|
|||
|
|
@ -749,8 +749,6 @@ minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch,
|
|||
if time_diff <= 500000 and time_diff >= 0 then
|
||||
player:get_meta():set_int("mcl_damage:invulnerable", 1)
|
||||
minetest.after(0.5, function()
|
||||
local player = minetest.get_player_by_name(name)
|
||||
if not player then return end
|
||||
player:get_meta():set_int("mcl_damage:invulnerable", 0)
|
||||
end)
|
||||
damage = damage - mcl_playerplus_internal[name].last_damage
|
||||
|
|
@ -763,8 +761,6 @@ minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch,
|
|||
mcl_playerplus_internal[name].invul_timestamp = time_now
|
||||
player:get_meta():set_int("mcl_damage:damage_animation", 1)
|
||||
minetest.after(0.5, function()
|
||||
local player = minetest.get_player_by_name(name)
|
||||
if not player then return end
|
||||
player:get_meta():set_int("mcl_damage:damage_animation", 0)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -163,8 +163,6 @@ function mcl_skins.update_player_skin(player)
|
|||
local skin = mcl_skins.player_skins[player]
|
||||
local skinval = mcl_skins.compile_skin(skin)
|
||||
|
||||
if not skin.cape then skin.cape = "blank.png" end
|
||||
|
||||
if player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" then
|
||||
skinval = skinval:gsub("%^" .. skin.cape, "")
|
||||
-- don't render the "normal" cape on players while wearing the elytra.
|
||||
|
|
@ -285,7 +283,7 @@ function mcl_skins.show_formspec(player, active_tab, page_num)
|
|||
|
||||
|
||||
local cape_tab = active_tab == "cape"
|
||||
|
||||
|
||||
if active_tab == "skin" then
|
||||
local page_start = (page_num - 1) * 8 - 1
|
||||
local page_end = math.min(page_start + 8 - 1, #mcl_skins.simple_skins)
|
||||
|
|
@ -353,7 +351,7 @@ function mcl_skins.show_formspec(player, active_tab, page_num)
|
|||
end
|
||||
|
||||
local slot_offset = 0
|
||||
|
||||
|
||||
if page_num == 1 then
|
||||
formspec = formspec ..
|
||||
"label[6,3;" .. S("(None)") .. "]"..
|
||||
|
|
@ -488,7 +486,7 @@ function mcl_skins.show_formspec(player, active_tab, page_num)
|
|||
end
|
||||
|
||||
if page_num > 1 then
|
||||
if cape_tab then
|
||||
if cape_tab then
|
||||
formspec = formspec ..
|
||||
"image_button[4.5,0.7;1,1;mcl_skins_arrow.png^[transformFX;previous_page;]"
|
||||
else
|
||||
|
|
@ -725,4 +723,4 @@ if not minetest.settings:get_bool("mcl_keepInventory", false) then
|
|||
minetest.register_on_respawnplayer(function(player)
|
||||
mcl_skins.update_player_skin(player) -- ensures players have their cape again after dying with an elytra
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
@ -105,10 +105,6 @@ mcl_hunger_debug (Hunger debug) bool false
|
|||
# Default: 0.5 s
|
||||
mcl_health_regen_delay (Health regen delay) float 0.5 0
|
||||
|
||||
# Eating delay while holding right-click
|
||||
# Default: 1.61 s
|
||||
mcl_eating_delay (Eating delay) float 1.61 0
|
||||
|
||||
[Mobs]
|
||||
# If enabled, mobs will spawn naturally. This does not affect
|
||||
# affect mob spawners.
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 182 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 162 B |
Binary file not shown.
|
Before Width: | Height: | Size: 156 B |
Binary file not shown.
|
Before Width: | Height: | Size: 229 B |
Binary file not shown.
|
Before Width: | Height: | Size: 171 B |
Binary file not shown.
|
Before Width: | Height: | Size: 180 B |
Binary file not shown.
|
Before Width: | Height: | Size: 144 B |
Binary file not shown.
|
Before Width: | Height: | Size: 170 B |
Binary file not shown.
|
Before Width: | Height: | Size: 165 B |
Binary file not shown.
|
Before Width: | Height: | Size: 177 B |
Binary file not shown.
|
Before Width: | Height: | Size: 164 B |
Binary file not shown.
|
Before Width: | Height: | Size: 199 B |
Binary file not shown.
|
Before Width: | Height: | Size: 158 B |
Binary file not shown.
|
Before Width: | Height: | Size: 169 B |
Binary file not shown.
|
Before Width: | Height: | Size: 170 B |
Binary file not shown.
|
Before Width: | Height: | Size: 138 B |
Binary file not shown.
|
Before Width: | Height: | Size: 152 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue