Fixed Git
This commit is contained in:
parent
08b77706ee
commit
7e670e93cb
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -25,3 +25,4 @@ hs_err_pid14552.log
|
|||
android/src/google-services.json
|
||||
android/src/debug/google-services.json
|
||||
android/google-services.json
|
||||
google-services.json
|
||||
|
|
674
LICENSE
Normal file
674
LICENSE
Normal file
|
@ -0,0 +1,674 @@
|
|||
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,4 +1,6 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'com.google.gms.google-services'
|
||||
apply plugin: 'com.google.firebase.crashlytics'
|
||||
|
||||
android {
|
||||
compileSdkVersion appAndroidCompileSDK
|
||||
|
@ -57,9 +59,31 @@ android {
|
|||
configurations { natives }
|
||||
|
||||
dependencies {
|
||||
implementation 'com.github.RohitSurwase.UCE-Handler:uce_handler:1.4'
|
||||
implementation project(':core')
|
||||
|
||||
// Import the Firebase BoM
|
||||
|
||||
|
||||
implementation platform('com.google.firebase:firebase-bom:30.3.1')
|
||||
|
||||
// Declare the dependencies for the Crashlytics and Analytics libraries
|
||||
// When using the BoM, you don't specify versions in Firebase library dependencies
|
||||
implementation 'com.google.firebase:firebase-crashlytics'
|
||||
implementation 'com.google.firebase:firebase-analytics'
|
||||
|
||||
|
||||
// Add the dependency for the Firebase SDK for Google Analytics
|
||||
|
||||
// When using the BoM, don't specify versions in Firebase dependencies
|
||||
|
||||
implementation 'com.google.firebase:firebase-analytics'
|
||||
|
||||
|
||||
// Add the dependencies for any other desired Firebase products
|
||||
|
||||
// https://firebase.google.com/docs/android/setup#available-libraries
|
||||
|
||||
|
||||
implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
|
||||
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
|
||||
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
|
||||
|
|
|
@ -5,6 +5,8 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.0.4'
|
||||
classpath 'com.google.gms:google-services:4.3.13'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -20,7 +22,7 @@ allprojects {
|
|||
appJavaCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
appAndroidCompileSDK = 30
|
||||
appAndroidMinSDK = 14
|
||||
appAndroidMinSDK = 19
|
||||
appAndroidTargetSDK = 30
|
||||
|
||||
gdxControllersVersion = '2.2.1'
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
###MLPD
|
||||
items.artifacts.wraithamulet.name=暗金宝石护符
|
||||
items.artifacts.wraithamulet.desc=来自于异世界的产物,能使自己进入虚无化。当护符能量足够多的时候,你还可以对敌人实行一次暗夜袭击,护符能量将会随着时间自动恢复。\n\n这个护符是证明给强者之人用的,冰雪魔女已经输的心服口服,现在她将此护身符给予给你。
|
||||
items.artifacts.wraithamulet.ac_ghost=遁入虚无
|
||||
items.artifacts.wraithamulet.ac_darkkill=暗夜袭击
|
||||
|
||||
items.scrolls.exotic.scrollofpolymorph.name=羊化秘卷
|
||||
items.scrolls.exotic.scrollofpolymorph.desc=这张秘卷富含强大的转换能力。当使用时,所有在使用者视野范围内的单位都将变形成一只魔法绵羊!\n\n这种变形过程是不可逆的,但不是所有敌人都会被影响。强大的敌人将抵抗这种魔法。同时变形后目标敌人身上的物品将会消失。
|
||||
|
||||
|
@ -197,7 +202,7 @@ items.wands.wandofgodice.desc=这根法杖的蔚蓝色色主干顶端镶嵌着
|
|||
items.wands.wandofgodice.stats_desc=这根法杖能射出冰冻冲击波,\n会造成_%1$d~%2$d点伤害_。\n对首领的可以造成双倍伤害!\n-翼绫,我很抱歉,我只能这样杀死你吗?
|
||||
|
||||
items.quest.goldbao.name=黄金珍宝
|
||||
items.quest.goldbao.desc=由钻石宝箱王守护的东西,据说是商人的喜爱产品。\n\n无论怎么样,现在珍宝已经在你手中,你已经打败了钻石宝箱王。\n提示:如果资金不够可以重新给商人展示,或许能让他心动!
|
||||
items.quest.goldbao.desc=由钻石宝箱王守护的东西,据说是商人的喜爱产品。\n\n无论怎么样,现在珍宝已经在你手中,你已经打败了钻石宝箱王。\n提示:出价资金可能会和实际资金不同,因为商人随时可能变卦。
|
||||
|
||||
items.quest.red.name=死灵精华十字架
|
||||
items.quest.red.desc=死灵领主的好东西,如果交给想要的人必然会有好运。
|
||||
|
|
|
@ -69,15 +69,15 @@ badges$badge.godd_make=老人与海\n累计完成老杖匠的全部任务\n\n_
|
|||
badges$badge.clear_water=净化大师\n完成挑战:污泥浊水\n\n_奖励:敬请期待_
|
||||
badges$badge.halofire_died=死于磷火烈焰
|
||||
badges$badge.happy_end=幸福结局
|
||||
badges$badge.champion_1=开启1项挑战通关
|
||||
badges$badge.champion_1x=开启1项挑战通关
|
||||
badges$badge.kill_slmking=击杀史莱姆王子
|
||||
badges$badge.big_x=巨人之殇\n\n突变巨兽开启通关!你已克服许多困难!!!\n\n_奖励:0层随机护甲(四大基座上)_
|
||||
badges$badge.exsg=大症若愚\n\n癔症只是一个假象,你仍然坚持过来了!\n\n_奖励:1500初始金币,两个经验药水_
|
||||
badges$badge.kill_dm720=击杀DM720\n\n矿洞的终极兵器\n\n_奖励:0层额外十字架(四大基座上,与冰雪魔女不叠加)_
|
||||
badges$badge.champion_2=地牢勇者\n\n_开启3项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_3=不屈斗士\n\n_开启6项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_4=超凡脱俗\n\n_开启8项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_5=救世之主\n\n_开启10项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_2x=地牢勇者\n\n_开启3项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_3x=不屈斗士\n\n_开启6项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_4x=超凡脱俗\n\n_开启8项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.champion_5x=救世之主\n\n_开启10项以上挑战通关\n\n[不包含BR模式和开发者模式]_
|
||||
badges$badge.unlock_mage=解锁法师
|
||||
badges$badge.unlock_rogue=解锁盗贼
|
||||
badges$badge.unlock_huntress=解锁女猎手
|
||||
|
@ -112,7 +112,7 @@ challenges.champion_enemies_desc=会升级的不止你一个!\n\n・普通敌
|
|||
的机率拥有特殊的精英属性。\n・精英敌人刷出时会立即醒来。\n・精英敌人免疫腐化效果。\n\n精英敌人有七种:\n_烈焰(橙色):_ 近战伤害 \
|
||||
+25% 且带有点燃效果,免疫火焰,死亡时引燃周围。\n_索敌(紫色):_ 近战伤害 +25%,近战范围 +8。\n_敌法(绿色):_ 受到伤害 -25%,拥有魔法免疫。\n_巨型(蓝色):_ 受到伤害 -75%,近战范围 +1,无法进入门与过道。\n_祝福(黄色):_ 精准与躲避 +200%。\n_成长(红色):_ 精准、躲避、攻击伤害与有效生命值 +20%。每过 3 回合会再增长 1%。\n_鬼磷(天蓝色):_ 近战伤害 +65% 且带有磷火效果,免疫火焰与磷火,死亡时引燃周围。
|
||||
challenges.stronger_bosses=Π梦魇Boss
|
||||
challenges.stronger_bosses_desc=这项挑战让挑战 Boss 变得更有挑战性了!\n\n_粘咕:_生命值 +20%\n_-_ 水中恢复量增长,每回合恢复 3 点生命\n_-_ 爆发攻击蓄力时间由 2 回合缩短至 1 回合\n_天狗:_生命 +25%\n_-_ 第一阶段:陷阱更加致命\n_-_ 第二阶段:技能频率更高\n_DM-300:_生命 +33%\n_-_ 能量塔更坚固,并且需要击毁 3 座\n_-_ 技能频率更高,威力也更强大\n_-_ 超载时移动速度更高\n_-_ 地表导线数量为原先的两倍\n_矮人国王:_生命 +50%\n_-_ 整场战斗内召唤的随从都更强大\n_-_ 第一阶段:技能与召唤频率都更高\n_-_ 第二阶段:每轮额外召唤两个随从\n_-_ 第三阶段:生命值 +100%,召唤频率更高\n_Yog-Dzewa:_\n_-_ 同时召唤两个古神之拳!\n_-_ 激光攻击伤害 +60%\n_-_ 召唤更强大的随从
|
||||
challenges.stronger_bosses_desc=这项挑战让挑战 Boss 变得更有挑战性了!\n\n_粘咕:_生命值 +20%\n_-_ 水中恢复量增长,每回合恢复 6 点生命\n_-_ 爆发攻击蓄力时间由 2 回合缩短至 1 回合\n_天狗:_生命 +25%\n_-_ 第一阶段:陷阱更加致命\n_-_ 第二阶段:技能频率更高\n_DM-300:_生命 +60%\n_-_ 能量塔更坚固。\n_-_ 技能频率更高,威力也更强大\n_-_ 超载时移动速度更高\n_-_ 击败时必掉落荆棘斗篷\n_矮人国王:_生命 +50%\n_-_ 整场战斗内召唤的随从都更强大\n_-_ 第一阶段:技能与召唤频率都更高\n_-_ 第二阶段:每轮额外召唤两个随从\n_-_ 第三阶段:生命值 +100%,召唤频率更高\n_Yog-Dzewa:_\n_-_ 同时召唤两个古神之拳!\n_-_ 激光攻击伤害 +60%\n_-_ 召唤更强大的随从\n_冰雪魔女:_\n_-_生命+25%\n_-_ 水中召唤的仆从更多\n-击败时必定掉落紫金宝石护符\n_矮人大师:_\n_-_ 致命技能更加频繁\n_-_ 生命值+50%\n-击败时必定掉落自然神圣护符\n_史莱姆王:_\n_-_ 生命值+100%\n_-_ 伤害更高,速度更快\n_-_ 在开局额外召唤豺狼诡术师,巨钳螃蟹,腐臭老鼠,蚀化史莱姆\n_-_ 击败时必定掉落凝胶手套\n_DM720:_\n_-_ 获得全新技能\n_-_ 击败时必定掉落DM150控制终端
|
||||
actors.char.aquaphobia=你受到了来自水的伤害!
|
||||
challenges.pro=Δ开发者模式Δ
|
||||
challenges.pro_desc=注解版?\n开局_几乎是全物品_!同时,你将无法通关!
|
||||
|
|
|
@ -3,6 +3,8 @@ windows.wndsettings$extendtab.splash_screen=启动界面
|
|||
windows.wndsettings$extendtab.disable=关闭
|
||||
windows.wndsettings$extendtab.full=开启
|
||||
|
||||
scenes.titlescene.spawnerror=楼层生成错误!!!
|
||||
|
||||
scenes.feedbackscene$1.title=确定退出游戏?
|
||||
scenes.feedbackscene$1.intro=你确定要退出游戏吗?
|
||||
scenes.feedbackscene$1.sponsor_msg=如果是,请点击退出游戏。如果不是,请点击回到游戏。
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 68 KiB |
|
@ -158,7 +158,7 @@ public class GamesInProgress {
|
|||
|
||||
public static class Info {
|
||||
public int slot;
|
||||
|
||||
|
||||
public int depth;
|
||||
public int version;
|
||||
public int challenges;
|
||||
|
|
|
@ -34,7 +34,7 @@ public class Statistics {
|
|||
public static int ankhsUsed;
|
||||
public static int spawnersIce;
|
||||
public static int naiyaziCollected;
|
||||
public static boolean isCustomSeed = false;
|
||||
public static boolean iscustomName = false;
|
||||
//used for hero unlock badges
|
||||
public static int upgradesUsed;
|
||||
public static int sneakAttacks;
|
||||
|
|
|
@ -219,7 +219,6 @@ public abstract class Char extends Actor {
|
|||
GameScene.updateFog();
|
||||
return true;
|
||||
}
|
||||
|
||||
//can't swap places if one char has restricted movement
|
||||
if (rooted || c.rooted || buff(Vertigo.class) != null || c.buff(Vertigo.class) != null){
|
||||
return true;
|
||||
|
|
|
@ -102,7 +102,7 @@ public abstract class ChampionHero extends FlavourBuff {
|
|||
}
|
||||
@Override
|
||||
public void fx(boolean on) {
|
||||
//
|
||||
//解决光斑问题
|
||||
}
|
||||
@Override
|
||||
public void onAttackProc(Char hero) {
|
||||
|
|
|
@ -66,7 +66,6 @@ public class Sanity extends Buff {
|
|||
if (sanity >= 180) {
|
||||
sanity -= Dungeon.depth/5+1;
|
||||
if(sanity == 179) {
|
||||
//GLog.w("我感到身体十分的沉重……奇怪的话语在你耳边环绕……");
|
||||
GLog.w(Messages.get(Sanity.class,"bad"));
|
||||
}
|
||||
} else if (sanity >= 120) {
|
||||
|
@ -79,7 +78,6 @@ public class Sanity extends Buff {
|
|||
if(--sanity-(Dungeon.depth/5) == 0){
|
||||
detach();
|
||||
target.die(this);
|
||||
//GLog.n("你彻底失去理智了……你的灵魂彻底裂开了……");
|
||||
GLog.n(Messages.get(Sanity.class,"diedsoul"));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ public class BloodBat extends Mob implements Callback {
|
|||
{
|
||||
HP = HT = 20;
|
||||
defenseSkill = 7;
|
||||
baseSpeed = 1.5f;
|
||||
baseSpeed = 2.5f;
|
||||
spriteClass = BlueBatSprite.class;
|
||||
alignment = Alignment.ALLY;
|
||||
WANDERING = new Wandering();
|
||||
|
|
|
@ -27,12 +27,12 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EnergyParticle
|
|||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.HalomethaneFlameParticle;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Ankh;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.TengusMask;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Viscosity;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.quest.GoldBAo;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlueFuck;
|
||||
|
@ -514,7 +514,7 @@ public class DimandKing extends Boss {
|
|||
Ankh ankh = new Ankh();
|
||||
ankh.bless();
|
||||
Dungeon.level.drop(new Ankh(), dropPos).sprite.drop(pos);
|
||||
Dungeon.level.drop(new GoldBAo().quantity(1), dropPos).sprite.drop(pos);
|
||||
Dungeon.level.drop(new Gold().quantity(Random.Int(2200, 5500)), pos).sprite.drop();
|
||||
Badges.validateBossSlain();
|
||||
|
||||
Dungeon.level.unseal();
|
||||
|
|
|
@ -65,9 +65,10 @@ public class Eye extends Mob {
|
|||
properties.add(Property.DEMONIC);
|
||||
}
|
||||
|
||||
public static void spawnAround() {
|
||||
public static void spawnAround(int pos) {
|
||||
for (int n : PathFinder.NEIGHBOURS4) {
|
||||
spawnAt( Random.Int(Dungeon.level.length()) + n );
|
||||
int cell = pos + n;
|
||||
spawnAt( Random.Int(Dungeon.level.length()) + cell );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
|
||||
package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
|
||||
|
||||
import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Badges;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
|
||||
|
@ -80,7 +82,7 @@ public class NewDM300 extends Mob {
|
|||
{
|
||||
spriteClass = DM300Sprite.class;
|
||||
|
||||
HP = HT = Dungeon.isChallenged(Challenges.STRONGER_BOSSES) ? 400 : 300;
|
||||
HP = HT = Dungeon.isChallenged(Challenges.STRONGER_BOSSES) ? 480 : 300;
|
||||
EXP = 30;
|
||||
defenseSkill = 15;
|
||||
|
||||
|
@ -151,7 +153,7 @@ public class NewDM300 extends Mob {
|
|||
|
||||
if (turnsSinceLastAbility != -1){
|
||||
BossHealthBar.assignBoss(this);
|
||||
if (!supercharged && pylonsActivated == totalPylonsToActivate()) BossHealthBar.bleed(true);
|
||||
if (!supercharged && pylonsActivated == 4) BossHealthBar.bleed(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -448,16 +450,11 @@ public class NewDM300 extends Mob {
|
|||
|
||||
int dmgTaken = preHP - HP;
|
||||
if (dmgTaken > 0) {
|
||||
LockedFloor lock = Dungeon.hero.buff(LockedFloor.class);
|
||||
LockedFloor lock = hero.buff(LockedFloor.class);
|
||||
if (lock != null && !isImmune(src.getClass())) lock.addTime(dmgTaken*1.5f);
|
||||
}
|
||||
|
||||
int threshold;
|
||||
if (Dungeon.isChallenged(Challenges.STRONGER_BOSSES)){
|
||||
threshold = HT / 4 * (3 - pylonsActivated);
|
||||
} else {
|
||||
threshold = HT / 3 * (2 - pylonsActivated);
|
||||
}
|
||||
int threshold = HT/4 * (4- pylonsActivated);
|
||||
|
||||
if (HP < threshold){
|
||||
HP = threshold;
|
||||
|
@ -466,10 +463,6 @@ public class NewDM300 extends Mob {
|
|||
|
||||
}
|
||||
|
||||
public int totalPylonsToActivate(){
|
||||
return Dungeon.isChallenged(Challenges.STRONGER_BOSSES) ? 3 : 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvulnerable(Class effect) {
|
||||
if (supercharged && !invulnWarned){
|
||||
|
@ -501,7 +494,7 @@ public class NewDM300 extends Mob {
|
|||
supercharged = false;
|
||||
((DM300Sprite)sprite).updateChargeState(false);
|
||||
|
||||
if (pylonsActivated < totalPylonsToActivate()){
|
||||
if (pylonsActivated < 4){
|
||||
yell(Messages.get(this, "charge_lost"));
|
||||
} else {
|
||||
yell(Messages.get(this, "pylons_destroyed"));
|
||||
|
@ -511,7 +504,7 @@ public class NewDM300 extends Mob {
|
|||
|
||||
@Override
|
||||
public boolean isAlive() {
|
||||
return super.isAlive() || pylonsActivated < totalPylonsToActivate();
|
||||
return super.isAlive() || pylonsActivated < 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,188 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.custom.visuals;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Chrome;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.custom.TextInput;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.custom.utils.Constants;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
|
||||
import com.watabou.noosa.NinePatch;
|
||||
|
||||
public abstract class ClassName extends RedButton {
|
||||
|
||||
private NinePatch inputWnd;
|
||||
|
||||
private RenderedTextBlock inputText;
|
||||
|
||||
private String hint = "";
|
||||
|
||||
private static final int MIN_HEIGHT_LARGE = 26;
|
||||
private static final int MIN_HEIGHT_PACKED = 18;
|
||||
|
||||
private int max_str_length = Integer.MAX_VALUE;
|
||||
|
||||
//defines if title and input window are in separate lines.
|
||||
private boolean large = true;
|
||||
|
||||
public ClassName( String label ) {
|
||||
this(label,"");
|
||||
}
|
||||
|
||||
public ClassName( String label, String txt ){
|
||||
super(label, 8);
|
||||
|
||||
inputText = PixelScene.renderTextBlock( 6 );
|
||||
inputText.text( txt );
|
||||
add( inputText );
|
||||
}
|
||||
|
||||
public void setTitle(String title){
|
||||
text.text(title);
|
||||
}
|
||||
|
||||
public void setHint(String hint){
|
||||
this.hint = hint;
|
||||
}
|
||||
|
||||
public void setMaxStringLength(int maxLength){
|
||||
this.max_str_length = Math.max(0, maxLength);
|
||||
}
|
||||
|
||||
public void setLarge(boolean isLarge){
|
||||
this.large = isLarge;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createChildren() {
|
||||
super.createChildren();
|
||||
|
||||
inputWnd = Chrome.get(Chrome.Type.TOAST);
|
||||
add(inputWnd);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onClick() {
|
||||
TextInput tinp = new TextInput(){
|
||||
@Override
|
||||
public void input(String text) {
|
||||
if(parent != null) {
|
||||
if (text.length() > max_str_length) {
|
||||
text = text.substring(0, max_str_length);
|
||||
}
|
||||
text(text);
|
||||
onTextChange();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void canceled() {
|
||||
if(parent != null) {
|
||||
onTextCancel();
|
||||
}
|
||||
}
|
||||
};
|
||||
if(Constants.gameIsAndroid()) {
|
||||
Gdx.input.getTextInput(tinp, text.text(), inputText.text(), hint);
|
||||
}else{
|
||||
TextInput.getTextInput(tinp, text.text(), inputText.text(), hint);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract void onTextChange();
|
||||
|
||||
public abstract void onTextCancel();
|
||||
|
||||
@Override
|
||||
public void text(String value) {
|
||||
inputText.text(value);
|
||||
if(value.equals("")){
|
||||
inputText.clear();
|
||||
}
|
||||
layout();
|
||||
}
|
||||
|
||||
public void label(String value){
|
||||
text.text(value);
|
||||
layout();
|
||||
}
|
||||
|
||||
public String text(){
|
||||
return inputText.text();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void enable(boolean value) {
|
||||
super.enable(value);
|
||||
inputText.alpha( value ? 1.0f : 0.3f );
|
||||
inputWnd.alpha( value ? 1.0f : 0.3f );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void layout() {
|
||||
|
||||
if(large) {
|
||||
bg.x = x;
|
||||
bg.y = y;
|
||||
height = Math.max(height, MIN_HEIGHT_LARGE);
|
||||
bg.size(width, height);
|
||||
|
||||
hotArea.x = x;
|
||||
hotArea.y = y;
|
||||
hotArea.width = width;
|
||||
hotArea.height = height;
|
||||
|
||||
if (icon != null) {
|
||||
text.setPos((width - text.width() - text.height() - 2) / 2, bg.y + 2);
|
||||
PixelScene.align(text);
|
||||
icon.scale.set((text.height() + 2) / icon.height);
|
||||
icon.x = text.right() + 2;
|
||||
icon.y = text.top() - 2;
|
||||
} else {
|
||||
text.setPos((width - text.width()) / 2, bg.y + 2);
|
||||
PixelScene.align(text);
|
||||
}
|
||||
|
||||
inputWnd.x = x + 2;
|
||||
inputWnd.y = text.bottom() + 2;
|
||||
inputWnd.size(width - 4, height - 7 - text.height());
|
||||
|
||||
inputText.maxWidth((int) inputWnd.width);
|
||||
inputText.setPos((inputWnd.width() - inputText.width()) / 2 + inputWnd.x, inputWnd.y + (inputWnd.height - inputText.height()) / 2);
|
||||
PixelScene.align(inputText);
|
||||
|
||||
}else{
|
||||
|
||||
bg.x = x;
|
||||
bg.y = y;
|
||||
height = Math.max(height, MIN_HEIGHT_PACKED);
|
||||
bg.size(width, height);
|
||||
|
||||
hotArea.x = x;
|
||||
hotArea.y = y;
|
||||
hotArea.width = width;
|
||||
hotArea.height = height;
|
||||
|
||||
if (icon != null) {
|
||||
icon.x = 1;
|
||||
icon.y = (bg.height - icon.height)/2 + bg.y;
|
||||
text.setPos(icon.x + icon.width() + 1, (bg.height - text.height())/2 + bg.y);
|
||||
PixelScene.align(text);
|
||||
} else {
|
||||
text.setPos( 2, (bg.height - text.height())/2 + bg.y);
|
||||
PixelScene.align(text);
|
||||
}
|
||||
|
||||
inputWnd.x = text.right() + 2;
|
||||
inputWnd.y = bg.y + 2;
|
||||
inputWnd.size(bg.x + bg.width - text.right() - 4, bg.height - 4);
|
||||
|
||||
inputText.maxWidth((int) inputWnd.width);
|
||||
inputText.setPos((inputWnd.width() - inputText.width()) / 2 + inputWnd.x, inputWnd.y + (inputWnd.height - inputText.height()) / 2);
|
||||
PixelScene.align(inputText);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -71,13 +71,13 @@ public class Item implements Bundlable {
|
|||
//TODO should these be private and accessed through methods?
|
||||
public int image = 0;
|
||||
public int icon = -1; //used as an identifier for items with randomized images
|
||||
|
||||
|
||||
public boolean stackable = false;
|
||||
public int flasks;
|
||||
protected int quantity = 1;
|
||||
public boolean dropsDownHeap = false;
|
||||
|
||||
private int level = 0;
|
||||
|
||||
public int level = 0;
|
||||
|
||||
public boolean levelKnown = false;
|
||||
|
||||
|
|
|
@ -0,0 +1,197 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.items.artifacts;
|
||||
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
|
||||
import com.watabou.utils.Random;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
|
||||
public class WraithAmulet extends Artifact {
|
||||
|
||||
{
|
||||
image = ItemSpriteSheet.WRALIPS;
|
||||
cooldown = 0;
|
||||
charge = Math.min(level()+3, 10);
|
||||
partialCharge = 0;
|
||||
chargeCap = Math.min(level()+3, 10);
|
||||
level = 0;
|
||||
levelCap = 10;
|
||||
defaultAction = AC_GHOST;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static final String AC_GHOST = "ghost";
|
||||
private static final String AC_ASSASSINATE = "darkkill";
|
||||
|
||||
@Override
|
||||
public Item upgrade(){
|
||||
chargeCap++;
|
||||
return super.upgrade();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int visiblyUpgraded() {
|
||||
return levelKnown ? Math.round((level()*8)/(float)levelCap): 0;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void execute(Hero hero, String action) {
|
||||
super.execute(hero, action);
|
||||
if(action.equals(AC_GHOST)){
|
||||
if (cooldown > 0) {
|
||||
GLog.i(Messages.get(this,"cooddown"));
|
||||
} else if(useableBasic()) {
|
||||
if(this.isEquipped(Dungeon.hero)){
|
||||
if(this.charge > 0) {
|
||||
exp += 5;
|
||||
Buff.affect(Dungeon.hero, Invisibility.class, Invisibility.DURATION);
|
||||
GLog.i(Messages.get(this,"ghost"));
|
||||
cooldown = 12 - (level / 2);
|
||||
charge--;
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"nochareup"));
|
||||
}
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"noequip"));
|
||||
}
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"whoareyou"));
|
||||
}
|
||||
} else if (action.equals(AC_ASSASSINATE)) {
|
||||
if(this.charge >= 5){
|
||||
GameScene.selectCell(porter);
|
||||
charge-=5;
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"nochareup"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected boolean useableBasic(){
|
||||
return true;
|
||||
}
|
||||
|
||||
protected boolean useable(){
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<String> actions(Hero hero) {
|
||||
ArrayList<String> actions = super.actions(hero);
|
||||
if (isEquipped(hero))
|
||||
actions.add(AC_GHOST);
|
||||
if (isEquipped(hero) && charge >= 7)
|
||||
actions.add(AC_ASSASSINATE);
|
||||
return actions;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ArtifactBuff passiveBuff() {
|
||||
return new WraithRecharge();
|
||||
}
|
||||
|
||||
public class WraithRecharge extends ArtifactBuff{
|
||||
@Override
|
||||
public boolean act() {
|
||||
if (charge < chargeCap && !cursed && useableBasic()) {
|
||||
partialCharge += 1 / (150f - (chargeCap - charge) * 15f);
|
||||
|
||||
if (partialCharge >= 1) {
|
||||
partialCharge--;
|
||||
charge++;
|
||||
|
||||
if (charge == chargeCap) {
|
||||
partialCharge = 0;
|
||||
}
|
||||
}
|
||||
} else if(cursed){
|
||||
if(Random.Int(40) == 0){
|
||||
GLog.i(Messages.get(this,"cursed"));
|
||||
}
|
||||
}
|
||||
|
||||
if(exp > level * 50){
|
||||
exp = 0;
|
||||
if(level < levelCap){
|
||||
//I must add Complete WraithAmulet
|
||||
//Ok,Ling will Complete WraithAmulet
|
||||
upgrade();
|
||||
exp += level * 50;
|
||||
GLog.p(Messages.get(this,"ghoststong"));
|
||||
}
|
||||
}
|
||||
|
||||
if (cooldown > 0)
|
||||
cooldown--;
|
||||
|
||||
updateQuickslot();
|
||||
spend(TICK);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String desc() {
|
||||
return Messages.get(this, "desc");
|
||||
}
|
||||
public int getCharge(){
|
||||
return this.charge;
|
||||
}
|
||||
protected static CellSelector.Listener porter = new CellSelector.Listener() {
|
||||
@Override
|
||||
public String prompt() {
|
||||
return Messages.get(this,"selectkill");
|
||||
}
|
||||
@Override
|
||||
public void onSelect(Integer target) {
|
||||
HashSet<Mob> victim = new HashSet<Mob>();
|
||||
if (target != null ) {
|
||||
|
||||
if (target == curUser.pos) {
|
||||
GLog.i(Messages.get(this,"select"));
|
||||
return;
|
||||
}
|
||||
|
||||
QuickSlotButton.target(Actor.findChar(target));
|
||||
if(Actor.findChar(target) != null){
|
||||
if(Level.distancex(Dungeon.hero.pos, target) == 1) {
|
||||
final WraithAmulet amulet = (WraithAmulet) Item.curItem;
|
||||
amulet.charge--;
|
||||
amulet.exp += 10;
|
||||
Objects.requireNonNull(Actor.findChar(target)).damage(Objects.requireNonNull(Actor.findChar(target)).HT, WraithAmulet.class);
|
||||
Dungeon.hero.pos = target;
|
||||
Dungeon.hero.sprite.emitter().start(ShadowParticle.UP, 0.05f, 10);
|
||||
ScrollOfTeleportation.appear(Dungeon.hero, target);
|
||||
Dungeon.observe();
|
||||
GLog.i(Messages.get(this,"killmobs"));
|
||||
}
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"far"));
|
||||
}
|
||||
} else {
|
||||
GLog.i(Messages.get(this,"notthere"));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -181,6 +181,24 @@ public abstract class Level implements Bundlable {
|
|||
private static final String BLOBS = "blobs";
|
||||
private static final String FEELING = "feeling";
|
||||
|
||||
public static int distancex(int a, int b) {
|
||||
int ax = a % getWidth();
|
||||
int ay = a / getWidth();
|
||||
int bx = b % getWidth();
|
||||
int by = b / getWidth();
|
||||
return Math.max(Math.abs(ax - bx), Math.abs(ay - by));
|
||||
}
|
||||
|
||||
public static final int WIDTHX = 48;
|
||||
public static final int HEIGHTX = 48;
|
||||
public static int getWidth() {
|
||||
return WIDTHX;
|
||||
}
|
||||
public static boolean[] fieldOfView = new boolean[getLength()];
|
||||
public static int getLength() {
|
||||
return 48*48;
|
||||
}
|
||||
|
||||
public void create() {
|
||||
|
||||
Random.pushGenerator( Dungeon.seedCurDepth() );
|
||||
|
|
|
@ -32,7 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ChillingTrap;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ConfusionTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.FlockTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GatewayTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.GeyserTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.OozeTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.ShockingTrap;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.SummoningTrap;
|
||||
|
|
|
@ -27,7 +27,6 @@ import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.Assets;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
|
||||
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
|
||||
|
@ -178,7 +177,7 @@ public class InterlevelScene extends PixelScene {
|
|||
fadeTime += 0.9f; //adds 1 second total
|
||||
//speed up transition when debugging
|
||||
} else if (DeviceCompat.isDebug()){
|
||||
fadeTime = 0.7f;
|
||||
fadeTime = 0.1f;
|
||||
}
|
||||
|
||||
SkinnedBlock bg = new SkinnedBlock(Camera.main.width, Camera.main.height, loadingAsset ){
|
||||
|
@ -356,11 +355,9 @@ public class InterlevelScene extends PixelScene {
|
|||
s += "\n";
|
||||
s += t.toString();
|
||||
}
|
||||
ShatteredPixelDungeon.reportException(
|
||||
new RuntimeException("waited more than 10 seconds on levelgen. " +
|
||||
throw new RuntimeException(Messages.get(TitleScene.class,"spawnerror") +
|
||||
"Seed:" + Dungeon.seed + " depth:" + Dungeon.depth + " trace:" +
|
||||
s)
|
||||
);
|
||||
s);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -740,6 +740,7 @@ public class ItemSpriteSheet {
|
|||
public static final int SKPOTION = BAGS+57;
|
||||
public static final int SKNANO = BAGS+58;
|
||||
public static final int WATERSOUL = BAGS+59;
|
||||
public static final int WRALIPS = BAGS+60;
|
||||
|
||||
static{
|
||||
assignItemRect(VIAL, 16, 16);
|
||||
|
@ -754,6 +755,7 @@ public class ItemSpriteSheet {
|
|||
assignItemRect(SKPOTION, 12, 14);
|
||||
assignItemRect(SKNANO, 15, 14);
|
||||
assignItemRect(WATERSOUL, 14, 14);
|
||||
assignItemRect(WRALIPS, 16, 16);
|
||||
}
|
||||
|
||||
private static final int MAINBOOKINDEX = xy(1, 37); //16 slots
|
||||
|
|
|
@ -214,7 +214,7 @@ public class Window extends Group implements Signal.Listener<KeyEvent> {
|
|||
return new Point(xOffset, yOffset);
|
||||
}
|
||||
|
||||
public final void offset( Point offset ){
|
||||
public final void offset(Point offset ){
|
||||
offset(offset.x, offset.y);
|
||||
}
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ public class v0_6_X_Changes {
|
|||
"_-_ Bulk curse makes armor large, slowing movement through doorways.\n" +
|
||||
"_-_ Overgrowth curse causes random plant effects when you are struck."));
|
||||
|
||||
changes.addButton( new ChangeButton(BadgeBanner.image(Badges.Badge.CHAMPION_3.image), "New and Changed Badges",
|
||||
changes.addButton( new ChangeButton(BadgeBanner.image(Badges.Badge.CHAMPION_3X.image), "New and Changed Badges",
|
||||
"_-_ Added badges for winning with 3 challenges at once and 6 challenges at once.\n\n" +
|
||||
"_-_ 'Death by glyph' badge is now 'death by deferred damage'.\n\n" +
|
||||
"_-_ Removed rare monster slayer badge."));
|
||||
|
|
|
@ -9,5 +9,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
|
|||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
org.gradle.parallel=true
|
||||
android.useAndroidX=true
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
Loading…
Reference in New Issue
Block a user