Typo

Add test award for punch entity
Add kill_mob and punch_entity triggers; it's now possible to create awards for killing mobs and punching entities
2025-10-31 04:55:32 +01:00 · 2018-06-14 08:11:18 +02:00 · 2018-06-14 08:09:21 +02:00 · 2018-06-14 07:54:44 +02:00 · 2018-05-31 15:06:56 +01:00 · 2018-04-17 22:37:09 +01:00
11 changed files with 491 additions and 749 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,502 +1,19 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
+Copyright (c) 2013-8 rubenwardy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,34 +1,60 @@
 # Awards

-Adds achievements to Minetest (plus a very good API).
+Adds awards/achievements to Minetest (plus a very good API).

-by [rubenwardy](https://rubenwardy.com),
-with thanks to Wuzzy, kaeza, and MrIbby.
+by [rubenwardy](https://rubenwardy.com), licensed under MIT.
+With thanks to Wuzzy, kaeza, and MrIbby.

 Majority of awards are back ported from Calinou's old fork in Carbone, under same license.

 # API

-## Registering Achievements
+## Registering Awards

 ```lua
-awards.register_achievement(name, {
+awards.register_award("mymod:myaward", {
 	description = "The title of the award",

 	-- Optional:

+	difficulty = 1.0, -- Difficulty multipler
+
+	requires = { "amod:an_award" }, -- don't show this award or allow it to be unlocked
+									-- until required awards are unlocked
+
 	sound = {}, -- SimpleSoundSpec or false to play no sound
 	            -- if not provided, uses default sound
+
 	image = "icon_image.png", -- uses default icon otherwise
+
 	background = "background_image.png", -- uses default background otherwise

+
 	trigger = { -- is only unlocked by direct calls to awards.unlock() otherwise
 		type = "trigger_type",
 		-- see specific docs on the trigger to see what else goes here
-	}
+	},
+
+	-- Callback. award_def is this table (plus some additional methods/members added by register_award)
+	on_unlock = function(name, award_def) end,
 })
 ```

+If the award is counted, ie: there's a trigger.target property, then the difficulty
+multipler is timesd by target to get the overal difficulty. If the award isn't a
+counted type then the difficulty multiplier is used as the overal difficulty.
+Award difficulty affects how awards are sorted in a list - more difficult awards
+are further down the list.
+
+Actual code used to calculate award difficulty:
+
+```lua
+local difficulty = def.difficulty or 1
+if def.trigger and def.trigger.target then
+	difficulty = difficulty * def.trigger.target
+end
+```
+
 ## Registering Trigger Types

 ```lua
@@ -38,7 +64,7 @@ local trigger = awards.register_trigger(name, {
 	progress = "%2/%2"
 	auto_description = { "Mine: @2", "Mine: @1×@2" },

-	on_register = function(self, def) end
+	on_register = function(self, def) end,

 	-- "counted_key" only, when no key is given (ie: a total)
 	auto_description_total = { "Mine @1 block.", "Mine @1 blocks." },
@@ -46,7 +72,7 @@ local trigger = awards.register_trigger(name, {
 	-- "counted_key" only, get key for particular award - return nil for a total
 	get_key = function(self, def)
 		return minetest.registered_aliases[def.trigger.node] or def.trigger.node
-	end
+	end,
 })
 ```

@@ -107,46 +133,47 @@ Callbacks (register a function to be run)
 ### dig

 	trigger = {
-		type = "dig",
-		node = "default:dirt",
-		target = 50
+		type   = "dig",
+		node   = "default:dirt",
+		target = 50,
 	}

 ### place

 	trigger = {
-		type = "place",
-		node = "default:dirt",
-		target = 50
+		type   = "place",
+		node   = "default:dirt",
+		target = 50,
 	}

 ### death

 	trigger = {
-		type = "death",
-		target = 5
+		type   = "death",
+		reason = "fall",
+		target = 5,
 	}

 ### chat

 	trigger = {
-		type = "chat",
-		target = 100
+		type   = "chat",
+		target = 100,
 	}

 ### join

 	trigger = {
-		type = "join",
-		target = 100
+		type   = "join",
+		target = 100,
 	}

 ### eat

 	trigger = {
-		type = "eat",
-		item = "default:apple",
-		target = 100
+		type   = "eat",
+		item   = "default:apple",
+		target = 100,
 	}

 ## Callbacks relating to triggers
--- a/api.lua
+++ b/api.lua
@@ -1,18 +1,4 @@
-- AWARDS
--
-- Copyright (C) 2013-2015 rubenwardy
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU Lesser General Public License as published by
-- the Free Software Foundation; either version 2.1 of the License, or
-- (at your option) any later version.
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- GNU Lesser General Public License for more details.
-- You should have received a copy of the GNU Lesser General Public License along
-- with this program; if not, write to the Free Software Foundation, Inc.,
-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--
+-- Copyright (c) 2013-18 rubenwardy. MIT.

 local S, NS = awards.gettext, awards.ngettext

@@ -65,12 +51,14 @@ local function convert_data()
 			local ret = {}

 			local count = 0
-			for modname, items in pairs(data[from]) do
-				for itemname, value in pairs(items) do
-					itemname = modname .. ":" .. itemname
-					local key = minetest.registered_aliases[itemname] or itemname
-					ret[key] = value
-					count = count + value
+			if data[from] then
+				for modname, items in pairs(data[from]) do
+					for itemname, value in pairs(items) do
+						itemname = modname .. ":" .. itemname
+						local key = minetest.registered_aliases[itemname] or itemname
+						ret[key] = value
+						count = count + value
+					end
 				end
 			end

@@ -81,8 +69,6 @@ local function convert_data()

 		awards.players[name] = data
 	end
-
-	print(dump(awards.players))
 end

 function awards.load()
@@ -105,6 +91,7 @@ function awards.load()
 end

 function awards.player(name)
+	assert(type(name) == "string")
 	local data = awards.players[name] or {}
 	awards.players[name] = data
 	data.name = data.name or name
@@ -175,7 +162,6 @@ function awards.register_trigger(tname, tdef)
 			assert(player and player.is_player and player:is_player())
 			local name = player:get_player_name()
 			local data = awards.player(name)
-			print(dump(data))

 			-- Increment counter
 			local currentVal = (data[tname] or 0) + 1
@@ -238,7 +224,6 @@ function awards.register_trigger(tname, tdef)
 			assert(player and player.is_player and player:is_player() and key)
 			local name = player:get_player_name()
 			local data = awards.player(name)
-			print(dump(data))

 			-- Increment counter
 			data[tname] = data[tname] or {}
@@ -256,7 +241,7 @@ function awards.register_trigger(tname, tdef)
 					return
 				end

-				if current > entry.target then
+				if current >= entry.target then
 					return entry.award
 				end
 			end)
@@ -299,7 +284,7 @@ function awards.register_on_unlock(func)
 	table.insert(awards.on_unlock, func)
 end

-function awards.register_achievement(name, def)
+function awards.register_award(name, def)
 	def.name = name

 	-- Add Triggers
@@ -309,6 +294,19 @@ function awards.register_achievement(name, def)
 		tdef:on_register(def)
 	end

+	function def:can_unlock(data)
+		if not self.requires then
+			return true
+		end
+
+		for i=1, #self.requires do
+			if not data.unlocked[self.requires[i]] then
+				return false
+			end
+		end
+		return true
+	end
+
 	-- Add Award
 	awards.registered_awards[name] = def

@@ -337,7 +335,7 @@ function awards.clear_player(name)
 end

 -- This function is called whenever a target condition is met.
-- It checks if a player already has that achievement, and if they do not,
+-- It checks if a player already has that award, and if they do not,
 -- it gives it to them
 ----------------------------------------------
 --awards.unlock(name, award)
@@ -354,6 +352,12 @@ function awards.unlock(name, award)
 		return
 	end

+	if not awdef:can_unlock(data) then
+		minetest.log("warning", "can_unlock returned false in unlock of " ..
+				award .. " for " .. name)
+		return
+	end
+
 	-- Unlock Award
 	minetest.log("action", name.." has unlocked award "..name)
 	data.unlocked[award] = award
@@ -405,10 +409,10 @@ function awards.unlock(name, award)

 	if awards.show_mode == "chat" then
 		local chat_announce
-		if awdef.secret == true then
-			chat_announce = S("Secret Achievement Unlocked: %s")
+		if awdef.secret then
+			chat_announce = S("Secret Award Unlocked: %s")
 		else
-			chat_announce = S("Achievement Unlocked: %s")
+			chat_announce = S("Award Unlocked: %s")
 		end
 		-- use the chat console to send it
 		minetest.chat_send_player(name, string.format(chat_announce, title))
@@ -422,15 +426,15 @@ function awards.unlock(name, award)
 			name = "award_bg",
 			scale = {x = 2, y = 1},
 			text = background,
-			position = {x = 0.5, y = 0},
+			position = {x = 0.5, y = 0.05},
 			offset = {x = 0, y = 138},
 			alignment = {x = 0, y = -1}
 		})
 		local hud_announce
-		if awdef.secret == true then
-			hud_announce = S("Secret Achievement Unlocked!")
+		if awdef.secret then
+			hud_announce = S("Secret Award Unlocked!")
 		else
-			hud_announce = S("Achievement Unlocked!")
+			hud_announce = S("Award Unlocked!")
 		end
 		local two = player:hud_add({
 			hud_elem_type = "text",
@@ -438,8 +442,8 @@ function awards.unlock(name, award)
 			number = 0xFFFFFF,
 			scale = {x = 100, y = 20},
 			text = hud_announce,
-			position = {x = 0.5, y = 0},
-			offset = {x = 0, y = 40},
+			position = {x = 0.5, y = 0.05},
+			offset = {x = 0, y = 45},
 			alignment = {x = 0, y = -1}
 		})
 		local three = player:hud_add({
@@ -448,8 +452,8 @@ function awards.unlock(name, award)
 			number = 0xFFFFFF,
 			scale = {x = 100, y = 20},
 			text = title,
-			position = {x = 0.5, y = 0},
-			offset = {x = 30, y = 100},
+			position = {x = 0.5, y = 0.05},
+			offset = {x = 0, y = 100},
 			alignment = {x = 0, y = -1}
 		})
 		local four = player:hud_add({
@@ -457,15 +461,18 @@ function awards.unlock(name, award)
 			name = "award_icon",
 			scale = {x = 4, y = 4},
 			text = icon,
-			position = {x = 0.4, y = 0},
-			offset = {x = -81.5, y = 126},
+			position = {x = 0.5, y = 0.05},
+			offset = {x = -200.5, y = 126},
 			alignment = {x = 0, y = -1}
 		})
 		minetest.after(4, function()
-			player:hud_remove(one)
-			player:hud_remove(two)
-			player:hud_remove(three)
-			player:hud_remove(four)
+			local player2 = minetest.get_player_by_name(name)
+			if player2 then
+				player2:hud_remove(one)
+				player2:hud_remove(two)
+				player2:hud_remove(three)
+				player2:hud_remove(four)
+			end
 		end)
 	end
 end
--- a/awards.lua
+++ b/awards.lua
@@ -1,8 +1,10 @@
+-- Copyright (c) 2013-18 rubenwardy and Wuzzy. MIT.
+
 local S = awards.gettext

 -- Saint-Maclou
 if minetest.get_modpath("moreblocks") then
-	awards.register_achievement("award_saint_maclou",{
+	awards.register_award("award_saint_maclou",{
 		title = S("Saint-Maclou"),
 		description = S("Place 20 coal checkers."),
 		icon = "awards_novicebuilder.png",
@@ -14,7 +16,7 @@ if minetest.get_modpath("moreblocks") then
 	})

 	-- Castorama
-	awards.register_achievement("award_castorama",{
+	awards.register_award("award_castorama",{
 		title = S("Castorama"),
 		description = S("Place 20 iron checkers."),
 		icon = "awards_novicebuilder.png",
@@ -26,7 +28,7 @@ if minetest.get_modpath("moreblocks") then
 	})

 	-- Sam the Trapper
-	awards.register_achievement("award_sam_the_trapper",{
+	awards.register_award("award_sam_the_trapper",{
 		title = S("Sam the Trapper"),
 		description = S("Place 2 trap stones."),
 		icon = "awards_novicebuilder.png",
@@ -41,7 +43,7 @@ end
 -- This award can't be part of Unified Inventory, it would make a circular dependency
 if minetest.get_modpath("unified_inventory") then
 	if minetest.get_all_craft_recipes("unified_inventory:bag_large") ~= nil then
-		awards.register_achievement("awards_ui_bags", {
+		awards.register_award("awards_ui_bags", {
 			title = S("Backpacker"),
 			description = S("Craft 4 large bags."),
 			icon = "awards_ui_bags.png",
@@ -55,7 +57,7 @@ if minetest.get_modpath("unified_inventory") then
 end

 if minetest.get_modpath("fire") then
-	awards.register_achievement("awards_pyro", {
+	awards.register_award("awards_pyro", {
 		title = S("Pyromaniac"),
 		description = S("Craft 8 times flint and steel."),
 		icon = "fire_flint_steel.png",
@@ -66,7 +68,7 @@ if minetest.get_modpath("fire") then
 		}
 	})
 	if minetest.settings:get_bool("disable_fire") ~= true then
-		awards.register_achievement("awards_firefighter", {
+		awards.register_award("awards_firefighter", {
 			title = S("Firefighter"),
 			description = S("Put out 1000 fires."),
 			icon = "awards_firefighter.png",
@@ -81,10 +83,11 @@ end

 if minetest.get_modpath("default") then
 	-- Light it up
-	awards.register_achievement("award_lightitup",{
+	awards.register_award("award_lightitup",{
 		title = S("Light It Up"),
 		description = S("Place 100 torches."),
 		icon = "awards_novicebuilder.png^awards_level1.png",
+		difficulty = 0.01,
 		trigger = {
 			type = "place",
 			node = "default:torch",
@@ -93,10 +96,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Light ALL the things!
-	awards.register_achievement("award_well_lit",{
+	awards.register_award("award_well_lit",{
 		title = S("Well Lit"),
-		description = S("Place 1,000 torches."),
 		icon = "awards_novicebuilder.png^awards_level2.png",
+		description = S("Place 1,000 torches."),
+		difficulty = 0.01,
 		trigger = {
 			type = "place",
 			node = "default:torch",
@@ -104,10 +108,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_meselamp",{
+	awards.register_award("award_meselamp",{
 		title = S("Really Well Lit"),
 		description = S("Craft 10 mese lamps."),
 		icon = "default_meselamp.png",
+		difficulty = 0.2,
 		trigger = {
 			type = "craft",
 			item = "default:meselamp",
@@ -115,10 +120,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_stonebrick", {
+	awards.register_award("awards_stonebrick", {
 		title = S("Outpost"),
 		description = S("Craft 200 stone bricks."),
 		icon = "default_stone_brick.png^awards_level1.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item = "default:stonebrick",
@@ -126,10 +132,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_stonebrick2", {
+	awards.register_award("awards_stonebrick2", {
 		title = S("Watchtower"),
 		description = S("Craft 800 stone bricks."),
 		icon = "default_stone_brick.png^awards_level2.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item = "default:stonebrick",
@@ -137,10 +144,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_stonebrick3", {
+	awards.register_award("awards_stonebrick3", {
 		title = S("Fortress"),
 		description = S("Craft 3,200 stone bricks."),
 		icon = "default_stone_brick.png^awards_level3.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item = "default:stonebrick",
@@ -148,10 +156,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_desert_stonebrick", {
+	awards.register_award("awards_desert_stonebrick", {
 		title = S("Desert Dweller"),
 		description = S("Craft 400 desert stone bricks."),
 		icon = "default_desert_stone_brick.png",
+		difficulty = 0.09,
 		trigger = {
 			type = "craft",
 			item = "default:desert_stonebrick",
@@ -159,10 +168,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_desertstonebrick", {
+	awards.register_award("awards_desertstonebrick", {
 		title = S("Pharaoh"),
 		description = S("Craft 100 sandstone bricks."),
 		icon = "default_sandstone_brick.png",
+		difficulty = 0.09,
 		trigger = {
 			type = "craft",
 			item = "default:sandstonebrick",
@@ -170,10 +180,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_bookshelf", {
+	awards.register_award("awards_bookshelf", {
 		title = S("Little Library"),
 		description = S("Craft 7 bookshelves."),
 		icon = "default_bookshelf.png",
+		difficulty = 0.2,
 		trigger = {
 			type = "craft",
 			item = "default:bookshelf",
@@ -181,11 +192,12 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_obsidian", {
+	awards.register_award("awards_obsidian", {
 		title = S("Lava and Water"),
 		description = S("Mine your first obsidian."),
 		icon = "default_obsidian.png^awards_level1.png",
 		background = "awards_bg_mining.png",
+		difficulty = 1.5,
 		trigger = {
 			type = "dig",
 			node = "default:obsidian",
@@ -194,11 +206,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Obsessed with Obsidian
-	awards.register_achievement("award_obsessed_with_obsidian",{
+	awards.register_award("award_obsessed_with_obsidian",{
 		title = S("Obsessed with Obsidian"),
 		description = S("Mine 50 obsidian."),
 		icon = "default_obsidian.png^awards_level2.png",
 		background = "awards_bg_mining.png",
+		difficulty = 1.5,
 		trigger = {
 			type = "dig",
 			node = "default:obsidian",
@@ -207,11 +220,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Proof that player has found lava
-	awards.register_achievement("award_lavaminer",{
+	awards.register_award("award_lavaminer",{
 		title = S("Lava Miner"),
 		description = S("Mine any block while being very close to lava."),
 		background = "awards_bg_mining.png",
 		icon = "default_lava.png",
+		difficulty = 1,
 	})
 	awards.register_on_dig(function(player,data)
 		local pos = player:get_pos()
@@ -223,10 +237,11 @@ if minetest.get_modpath("default") then
 	end)

 	-- On the way
-	awards.register_achievement("award_on_the_way", {
+	awards.register_award("award_on_the_way", {
 		title = S("On The Way"),
 		description = S("Place 100 rails."),
 		icon = "carts_rail_straight.png",
+		difficulty = 0.1,
 		trigger = {
 			type = "place",
 			node = "default:rail",
@@ -234,10 +249,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_lumberjack_firstday", {
+	awards.register_award("award_lumberjack_firstday", {
 		title = S("First Day in the Woods"),
 		description = S("Dig 6 tree blocks."),
 		icon = "default_tree.png^awards_level1.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "dig",
 			node = "default:tree",
@@ -246,10 +262,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Lumberjack
-	awards.register_achievement("award_lumberjack", {
+	awards.register_award("award_lumberjack", {
 		title = S("Lumberjack"),
 		description = S("Dig 36 tree blocks."),
 		icon = "default_tree.png^awards_level2.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "dig",
 			node = "default:tree",
@@ -258,10 +275,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Semi-pro Lumberjack
-	awards.register_achievement("award_lumberjack_semipro", {
+	awards.register_award("award_lumberjack_semipro", {
 		title = S("Semi-pro Lumberjack"),
 		description = S("Dig 216 tree blocks."),
 		icon = "default_tree.png^awards_level3.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "dig",
 			node = "default:tree",
@@ -270,10 +288,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Professional Lumberjack
-	awards.register_achievement("award_lumberjack_professional", {
+	awards.register_award("award_lumberjack_professional", {
 		title = S("Professional Lumberjack"),
 		description = S("Dig 1,296 tree blocks."),
 		icon = "default_tree.png^awards_level4.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "dig",
 			node = "default:tree",
@@ -282,10 +301,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Junglebaby
-	awards.register_achievement("award_junglebaby", {
+	awards.register_award("award_junglebaby", {
 		title = S("Junglebaby"),
 		description = S("Dig 100 jungle tree blocks."),
 		icon = "default_jungletree.png^awards_level1.png",
+		difficulty = 0.05,
 		trigger = {
 			type = "dig",
 			node = "default:jungletree",
@@ -294,10 +314,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Jungleman
-	awards.register_achievement("award_jungleman", {
+	awards.register_award("award_jungleman", {
 		title = S("Jungleman"),
 		description = S("Dig 1,000 jungle tree blocks."),
 		icon = "default_jungletree.png^awards_level2.png",
+		difficulty = 0.05,
 		trigger = {
 			type = "dig",
 			node = "default:jungletree",
@@ -306,11 +327,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Found some Mese!
-	awards.register_achievement("award_mesefind", {
+	awards.register_award("award_mesefind", {
 		title = S("First Mese Find"),
 		description = S("Mine your first mese ore."),
 		icon = "default_stone.png^default_mineral_mese.png",
 		background = "awards_bg_mining.png",
+		difficulty = 1,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_mese",
@@ -319,12 +341,13 @@ if minetest.get_modpath("default") then
 	})

 	-- Mese Block
-	awards.register_achievement("award_meseblock", {
+	awards.register_award("award_meseblock", {
 		secret = true,
 		title = S("Mese Mastery"),
 		description = S("Mine a mese block."),
 		icon = "default_mese_block.png",
 		background = "awards_bg_mining.png",
+		difficulty = 1.1,
 		trigger = {
 			type = "dig",
 			node = "default:mese",
@@ -333,11 +356,12 @@ if minetest.get_modpath("default") then
 	})

 	-- You're a copper
-	awards.register_achievement("award_youre_a_copper", {
+	awards.register_award("award_youre_a_copper", {
 		title = S("You’re a copper"),
 		description = S("Dig 1,000 copper ores."),
 		icon = "default_stone.png^default_mineral_copper.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.2,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_copper",
@@ -345,25 +369,13 @@ if minetest.get_modpath("default") then
 		}
 	})

-	-- Found a Nyan cat!
-	awards.register_achievement("award_nyanfind", {
-		secret = true,
-		title = S("A Cat in a Pop-Tart?!"),
-		description = S("Mine a nyan cat."),
-		icon = "nyancat_front.png",
-		trigger = {
-			type = "dig",
-			node = "default:nyancat",
-			target = 1
-		}
-	})
-
 	-- Mini Miner
-	awards.register_achievement("award_mine2", {
+	awards.register_award("award_mine2", {
 		title = S("Mini Miner"),
 		description = S("Dig 100 stone blocks."),
 		icon = "awards_miniminer.png^awards_level1.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.02,
 		trigger = {
 			type = "dig",
 			node = "default:stone",
@@ -372,11 +384,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Hardened Miner
-	awards.register_achievement("award_mine3", {
+	awards.register_award("award_mine3", {
 		title = S("Hardened Miner"),
 		description = S("Dig 1,000 stone blocks."),
 		icon = "awards_miniminer.png^awards_level2.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.02,
 		trigger = {
 			type = "dig",
 			node = "default:stone",
@@ -385,11 +398,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Master Miner
-	awards.register_achievement("award_mine4", {
+	awards.register_award("award_mine4", {
 		title = S("Master Miner"),
 		description = S("Dig 10,000 stone blocks."),
 		icon = "awards_miniminer.png^awards_level3.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.02,
 		trigger = {
 			type = "dig",
 			node = "default:stone",
@@ -398,11 +412,12 @@ if minetest.get_modpath("default") then
 	})

 	-- Marchand de sable
-	awards.register_achievement("award_marchand_de_sable", {
+	awards.register_award("award_marchand_de_sable", {
 		title = S("Marchand De Sable"),
 		description = S("Dig 1,000 sand."),
 		icon = "default_sand.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.05,
 		trigger = {
 			type = "dig",
 			node = "default:sand",
@@ -410,10 +425,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_crafter_of_sticks", {
+	awards.register_award("awards_crafter_of_sticks", {
 		title = S("Crafter of Sticks"),
 		description = S("Craft 100 sticks."),
 		icon = "default_stick.png",
+		difficulty = 0.01,
 		trigger = {
 			type = "craft",
 			item = "default:stick",
@@ -421,10 +437,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_junglegrass", {
+	awards.register_award("awards_junglegrass", {
 		title = S("Jungle Discoverer"),
 		description = S("Mine your first jungle grass."),
 		icon = "default_junglegrass.png",
+		difficulty = 0.009,
 		trigger = {
 			type = "dig",
 			node = "default:junglegrass",
@@ -432,10 +449,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_grass", {
+	awards.register_award("awards_grass", {
 		title = S("Grasslands Discoverer"),
 		description = S("Mine some grass."),
 		icon = "default_grass_3.png",
+		difficulty = 0.009,
 		trigger = {
 			type = "dig",
 			node = "default:grass_1",
@@ -443,10 +461,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_dry_grass", {
+	awards.register_award("awards_dry_grass", {
 		title = S("Savannah Discoverer"),
 		description = S("Mine some dry grass."),
 		icon = "default_dry_grass_3.png",
+		difficulty = 0.009,
 		trigger = {
 			type = "dig",
 			node = "default:dry_grass_3",
@@ -454,10 +473,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_cactus", {
+	awards.register_award("awards_cactus", {
 		title = S("Desert Discoverer"),
 		description = S("Mine your first cactus."),
 		icon = "default_cactus_side.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "dig",
 			node = "default:cactus",
@@ -465,10 +485,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_dry_shrub", {
+	awards.register_award("awards_dry_shrub", {
 		title = S("Far Lands"),
 		description = S("Mine your first dry shrub."),
 		icon = "default_dry_shrub.png",
+		difficulty = 0.009,
 		trigger = {
 			type = "dig",
 			node = "default:dry_shrub",
@@ -476,10 +497,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_ice", {
+	awards.register_award("awards_ice", {
 		title = S("Glacier Discoverer"),
 		description = S("Mine your first ice."),
 		icon = "default_ice.png",
+		difficulty = 0.02,
 		trigger = {
 			type = "dig",
 			node = "default:ice",
@@ -488,10 +510,11 @@ if minetest.get_modpath("default") then
 	})

 	-- Proof that player visited snowy lands
-	awards.register_achievement("awards_snowblock", {
+	awards.register_award("awards_snowblock", {
 		title = S("Very Simple Snow Man"),
 		description = S("Place two snow blocks."),
 		icon = "default_snow.png",
+		difficulty = 0.02,
 		trigger = {
 			type = "place",
 			node = "default:snowblock",
@@ -499,11 +522,12 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_gold_ore", {
+	awards.register_award("awards_gold_ore", {
 		title = S("First Gold Find"),
 		description = S("Mine your first gold ore."),
 		icon = "default_stone.png^default_mineral_gold.png^awards_level1.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.9,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_gold",
@@ -511,11 +535,12 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_gold_rush", {
+	awards.register_award("awards_gold_rush", {
 		title = S("Gold Rush"),
 		description = S("Mine 45 gold ores."),
 		icon = "default_stone.png^default_mineral_gold.png^awards_level2.png",
 		background = "awards_bg_mining.png",
+		difficulty = 0.9,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_gold",
@@ -523,10 +548,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_diamond_ore", {
+	awards.register_award("awards_diamond_ore", {
 		title = S("Wow, I am Diamonds!"),
 		description = S("Mine your first diamond ore."),
 		icon = "default_stone.png^default_mineral_diamond.png^awards_level1.png",
+		difficulty = 1,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_diamond",
@@ -534,11 +560,12 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_diamond_rush", {
+	awards.register_award("awards_diamond_rush", {
 		title = S("Girl's Best Friend"),
 		description = S("Mine 18 diamond ores."),
 		icon = "default_stone.png^default_mineral_diamond.png^awards_level2.png",
 		background = "awards_bg_mining.png",
+		difficulty = 1,
 		trigger = {
 			type = "dig",
 			node = "default:stone_with_diamond",
@@ -546,10 +573,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_diamondblock", {
+	awards.register_award("awards_diamondblock", {
 		title = S("Hardest Block on Earth"),
 		description = S("Craft a diamond block."),
 		icon = "default_diamond_block.png",
+		difficulty = 1.1,
 		trigger = {
 			type = "craft",
 			item = "default:diamondblock",
@@ -557,10 +585,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("awards_mossycobble", {
+	awards.register_award("awards_mossycobble", {
 		title = S("In the Dungeon"),
 		description = S("Mine a mossy cobblestone."),
 		icon = "default_mossycobble.png",
+		difficulty = 0.9,
 		trigger = {
 			type = "dig",
 			node = "default:mossycobble",
@@ -568,10 +597,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_furnace", {
+	awards.register_award("award_furnace", {
 		title = S("Smelter"),
 		description = S("Craft 10 furnaces."),
 		icon = "default_furnace_front.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item= "default:furnace",
@@ -579,10 +609,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_chest", {
+	awards.register_award("award_chest", {
 		title = S("Treasurer"),
 		description = S("Craft 15 chests."),
 		icon = "default_chest_front.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item= "default:chest",
@@ -590,10 +621,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_chest2", {
+	awards.register_award("award_chest2", {
 		title = S("Bankier"),
 		description = S("Craft 30 locked chests."),
 		icon = "default_chest_lock.png",
+		difficulty = 0.08,
 		trigger = {
 			type = "craft",
 			item= "default:chest_locked",
@@ -601,10 +633,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_brick", {
+	awards.register_award("award_brick", {
 		title = S("Bricker"),
 		description = S("Craft 200 brick blocks."),
 		icon = "default_brick.png",
+		difficulty = 0.03,
 		trigger = {
 			type = "craft",
 			item= "default:brick",
@@ -612,10 +645,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_obsidianbrick", {
+	awards.register_award("award_obsidianbrick", {
 		title = S("House of Obsidian"),
 		description = S("Craft 100 obsidian bricks."),
 		icon = "default_obsidian_brick.png",
+		difficulty = 0.4,
 		trigger = {
 			type = "craft",
 			item= "default:obsidianbrick",
@@ -623,10 +657,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_placestone", {
+	awards.register_award("award_placestone", {
 		title = S("Build a Cave"),
 		description = S("Place 100 stone."),
 		icon = "default_stone.png",
+		difficulty = 0.1,
 		trigger = {
 			type = "place",
 			node = "default:stone",
@@ -634,10 +669,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_woodladder", {
+	awards.register_award("award_woodladder", {
 		title = S("Long Ladder"),
 		description = S("Place 400 wooden ladders."),
 		icon = "default_ladder_wood.png",
+		difficulty = 0.1,
 		trigger = {
 			type = "place",
 			node = "default:ladder_wood",
@@ -645,10 +681,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_steelladder", {
+	awards.register_award("award_steelladder", {
 		title = S("Industrial Age"),
 		description = S("Place 40 steel ladders."),
 		icon = "default_ladder_steel.png",
+		difficulty = 1,
 		trigger = {
 			type = "place",
 			node = "default:ladder_steel",
@@ -656,10 +693,11 @@ if minetest.get_modpath("default") then
 		}
 	})

-	awards.register_achievement("award_apples", {
+	awards.register_award("award_apples", {
 		title = S("Yummy!"),
 		description = S("Eat 80 apples."),
 		icon = "default_apple.png",
+		difficulty = 0.1,
 		trigger = {
 			type = "eat",
 			item = "default:apple",
@@ -669,7 +707,7 @@ if minetest.get_modpath("default") then
 end

 if minetest.get_modpath("vessels") then
-	awards.register_achievement("award_vessels_shelf", {
+	awards.register_award("award_vessels_shelf", {
 		title = S("Glasser"),
 		icon = "vessels_shelf.png",
 		description = S("Craft 14 vessels shelves."),
@@ -682,7 +720,7 @@ if minetest.get_modpath("vessels") then
 end

 if minetest.get_modpath("farming") then
-	awards.register_achievement("awards_farmer", {
+	awards.register_award("awards_farmer", {
 		title = S("Farming Skills Acquired"),
 		description = S("Harvest a fully grown wheat plant."),
 		icon = "farming_wheat_8.png^awards_level1.png",
@@ -692,7 +730,7 @@ if minetest.get_modpath("farming") then
 			target = 1
 		}
 	})
-	awards.register_achievement("awards_farmer2", {
+	awards.register_award("awards_farmer2", {
 		title = S("Field Worker"),
 		description = S("Harvest 25 fully grown wheat plants."),
 		icon = "farming_wheat_8.png^awards_level2.png",
@@ -703,7 +741,7 @@ if minetest.get_modpath("farming") then
 		}
 	})

-	awards.register_achievement("awards_farmer3", {
+	awards.register_award("awards_farmer3", {
 		title = S("Aspiring Farmer"),
 		description = S("Harvest 125 fully grown wheat plants."),
 		icon = "farming_wheat_8.png^awards_level3.png",
@@ -714,7 +752,7 @@ if minetest.get_modpath("farming") then
 		}
 	})

-	awards.register_achievement("awards_farmer4", {
+	awards.register_award("awards_farmer4", {
 		title = S("Wheat Magnate"),
 		description = S("Harvest 625 fully grown wheat plants."),
 		icon = "farming_wheat_8.png^awards_level4.png",
@@ -725,7 +763,7 @@ if minetest.get_modpath("farming") then
 		}
 	})

-	awards.register_achievement("award_bread", {
+	awards.register_award("award_bread", {
 		title = S("Baker"),
 		description = S("Eat 10 loaves of bread."),
 		icon = "farming_bread.png",
@@ -739,7 +777,7 @@ if minetest.get_modpath("farming") then
 end

 if minetest.get_modpath("wool") and minetest.get_modpath("farming") then
-	awards.register_achievement("awards_wool", {
+	awards.register_award("awards_wool", {
 		title = S("Wool Over Your Eyes"),
 		description = S("Craft 250 white wool."),
 		icon = "wool_white.png",
@@ -752,7 +790,7 @@ if minetest.get_modpath("wool") and minetest.get_modpath("farming") then
 end

 if minetest.get_modpath("beds") then
-	awards.register_achievement("award_bed", {
+	awards.register_award("award_bed", {
 		title = S("Hotelier"),
 		description = S("Craft 15 fancy beds."),
 		icon = "beds_bed_fancy.png",
@@ -765,7 +803,7 @@ if minetest.get_modpath("beds") then
 end

 if minetest.get_modpath("stairs") then
-	awards.register_achievement("award_stairs_goldblock", {
+	awards.register_award("award_stairs_goldblock", {
 		title = S("Filthy Rich"),
 		description = S("Craft 24 gold block stairs."),
 		icon = "default_gold_block.png",
@@ -778,7 +816,7 @@ if minetest.get_modpath("stairs") then
 end

 if minetest.get_modpath("dye") then
-	awards.register_achievement("awards_dye_red", {
+	awards.register_award("awards_dye_red", {
 		title = S("Roses Are Red"),
 		description = S("Craft 400 red dyes."),
 		icon = "dye_red.png",
@@ -789,7 +827,7 @@ if minetest.get_modpath("dye") then
 		}
 	})

-	awards.register_achievement("awards_dye_yellow", {
+	awards.register_award("awards_dye_yellow", {
 		title = S("Dandelions are Yellow"),
 		description = S("Craft 400 yellow dyes."),
 		icon = "dye_yellow.png",
@@ -800,7 +838,7 @@ if minetest.get_modpath("dye") then
 		}
 	})

-	awards.register_achievement("awards_dye_blue", {
+	awards.register_award("awards_dye_blue", {
 		title = S("Geraniums are Blue"),
 		description = S("Craft 400 blue dyes."),
 		icon = "dye_blue.png",
@@ -811,7 +849,7 @@ if minetest.get_modpath("dye") then
 		}
 	})

-	awards.register_achievement("awards_dye_white", {
+	awards.register_award("awards_dye_white", {
 		title = S("White Color Stock"),
 		description = S("Craft 100 white dyes."),
 		icon = "dye_white.png",
@@ -824,7 +862,7 @@ if minetest.get_modpath("dye") then
 end

 if minetest.get_modpath("flowers") then
-	awards.register_achievement("awards_brown_mushroom1", {
+	awards.register_award("awards_brown_mushroom1", {
 		title = S("Tasty Mushrooms"),
 		description = S("Eat 3 brown mushrooms."),
 		icon = "flowers_mushroom_brown.png^awards_level1.png",
@@ -834,7 +872,7 @@ if minetest.get_modpath("flowers") then
 			target = 3,
 		}
 	})
-	awards.register_achievement("awards_brown_mushroom2", {
+	awards.register_award("awards_brown_mushroom2", {
 		title = S("Mushroom Lover"),
 		description = S("Eat 33 brown mushrooms."),
 		icon = "flowers_mushroom_brown.png^awards_level2.png",
@@ -844,7 +882,7 @@ if minetest.get_modpath("flowers") then
 			target = 33,
 		}
 	})
-	awards.register_achievement("awards_brown_mushroom3", {
+	awards.register_award("awards_brown_mushroom3", {
 		title = S("Underground Mushroom Farmer"),
 		description = S("Eat 333 brown mushrooms."),
 		icon = "flowers_mushroom_brown.png^awards_level3.png",
@@ -872,7 +910,7 @@ minetest.after(0, function()
 		return
 	end

-	awards.register_achievement("awards_builder1", {
+	awards.register_award("awards_builder1", {
 		title = S("Builder"),
 		icon = "awards_house.png^awards_level1.png",
 		trigger = {
@@ -880,7 +918,7 @@ minetest.after(0, function()
 			target = 1000,
 		},
 	})
-	awards.register_achievement("awards_builder2", {
+	awards.register_award("awards_builder2", {
 		title = S("Constructor"),
 		icon = "awards_house.png^awards_level2.png",
 		trigger = {
@@ -888,7 +926,7 @@ minetest.after(0, function()
 			target = 5000,
 		},
 	})
-	awards.register_achievement("awards_builder3", {
+	awards.register_award("awards_builder3", {
 		title = S("Architect"),
 		icon = "awards_house.png^awards_level3.png",
 		trigger = {
@@ -896,7 +934,7 @@ minetest.after(0, function()
 			target = 10000,
 		},
 	})
-	awards.register_achievement("awards_builder4", {
+	awards.register_award("awards_builder4", {
 		title = S("Master Architect"),
 		icon = "awards_house.png^awards_level4.png",
 		trigger = {
@@ -905,3 +943,60 @@ minetest.after(0, function()
 		},
 	})
 end)
+
+if minetest.get_modpath("nyancat") then
+	-- Found a Nyan cat!
+	awards.register_award("award_nyanfind", {
+		secret = true,
+		title = S("A Cat in a Pop-Tart?!"),
+		description = S("Mine a nyan cat."),
+		icon = "nyancat_front.png",
+		trigger = {
+			type = "dig",
+			node = "nyancat:nyancat",
+			target = 1
+		}
+	})
+end
+
+if minetest.get_modpath("mobs_animal") then
+	awards.register_award("mobs:kill_chicken", {
+		title = S("Chicken"),
+		description = S("A test award when mobs mod on"),
+		difficulty = 0.001,
+		trigger = {
+			type = "kill_mob",
+			mob = "mobs_animal:chicken",
+			target = 5
+		}
+	})
+	awards.register_award("mobs:kill_cow", {
+		title = S("Cows"),
+		description = S("A test award when mobs mod on"),
+		difficulty = 0.001,
+		trigger = {
+			type = "kill_mob",
+			mob = "mobs_animal:cow",
+			target = 5
+		}
+	})
+	awards.register_award("mobs:kill_all", {
+		title = S("All"),
+		description = S("A test award when mobs mod on"),
+		difficulty = 0.001,
+		trigger = {
+			type = "kill_mob",
+			target = 5
+		}
+	})
+end
+
+awards.register_award("pnch_entity_test", {
+	title = S("All"),
+	description = S("A test award for punching"),
+	difficulty = 0.001,
+	trigger = {
+		type = "punch_entity",
+		target = 5
+	}
+})
--- a/chat_commands.lua
+++ b/chat_commands.lua
@@ -1,24 +1,10 @@
-- AWARDS
--
-- Copyright (C) 2013-2015 rubenwardy
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU Lesser General Public License as published by
-- the Free Software Foundation; either version 2.1 of the License, or
-- (at your option) any later version.
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- GNU Lesser General Public License for more details.
-- You should have received a copy of the GNU Lesser General Public License along
-- with this program; if not, write to the Free Software Foundation, Inc.,
-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--
+-- Copyright (c) 2013-18 rubenwardy. MIT.

 local S = awards.gettext

 minetest.register_chatcommand("awards", {
 	params = S("[c|clear|disable|enable]"),
-	description = S("Show, clear, disable or enable your achievements"),
+	description = S("Show, clear, disable or enable your awards"),
 	func = function(name, param)
 		if param == "clear" then
 			awards.clear_player(name)
@@ -26,27 +12,34 @@ minetest.register_chatcommand("awards", {
 			S("All your awards and statistics have been cleared. You can now start again."))
 		elseif param == "disable" then
 			awards.disable(name)
-			minetest.chat_send_player(name, S("You have disabled your achievements."))
+			minetest.chat_send_player(name, S("You have disabled awards."))
 		elseif param == "enable" then
 			awards.enable(name)
-			minetest.chat_send_player(name, S("You have enabled your achievements."))
+			minetest.chat_send_player(name, S("You have enabled awards."))
 		elseif param == "c" then
 			awards.show_to(name, name, nil, true)
 		else
 			awards.show_to(name, name, nil, false)
 		end
+
+		if (param == "disable" or param == "enable") and minetest.global_exists("sfinv") then
+			local player = minetest.get_player_by_name(name)
+			if player then
+				sfinv.set_player_inventory_formspec(player)
+			end
+		end
 	end
 })

 minetest.register_chatcommand("awd", {
-	params = S("<achievement ID>"),
-	description = S("Show details of an achievement"),
+	params = S("<award ID>"),
+	description = S("Show details of an award"),
 	func = function(name, param)
 		local def = awards.registered_awards[param]
 		if def then
 			minetest.chat_send_player(name, string.format(S("%s: %s"), def.title, def.description))
 		else
-			minetest.chat_send_player(name, S("Achievement not found."))
+			minetest.chat_send_player(name, S("Award not found."))
 		end
 	end
 })
@@ -56,7 +49,7 @@ minetest.register_chatcommand("awpl", {
 		server = true
 	},
 	params = S("<name>"),
-	description = S("Get the achievements statistics for the given player or yourself"),
+	description = S("Get the awards statistics for the given player or yourself"),
 	func = function(name, param)
 		if not param or param == "" then
 			param = name
--- a/depends.txt
+++ b/depends.txt
@@ -11,3 +11,5 @@ vessels?
 moreblocks?
 fire?
 flowers?
+nyancat?
+mobs_animal?
--- a/gui.lua
+++ b/gui.lua
@@ -1,46 +1,94 @@
+-- Copyright (c) 2013-18 rubenwardy. MIT.
+
 local S = awards.gettext

 local function order_awards(name)
-	local done = {}
+	local hash_is_unlocked = {}
 	local retval = {}
-	local player = awards.player(name)
-	if player and player.unlocked then
-		for _,got in pairs(player.unlocked) do
-			if awards.registered_awards[got] then
-				done[got] = true
-				table.insert(retval,{name=got,got=true})
+
+	local data = awards.player(name)
+	if data and data.unlocked then
+		for awardname, _ in pairs(data.unlocked) do
+			local def = awards.registered_awards[awardname]
+			if def then
+				hash_is_unlocked[awardname] = true
+				local score = -100000
+
+				local difficulty = def.difficulty or 1
+				if def.trigger and def.trigger.target then
+					difficulty = difficulty * def.trigger.target
+				end
+				score = score + difficulty
+
+				retval[#retval + 1] = {
+					name     = awardname,
+					def      = def,
+					unlocked = true,
+					started  = true,
+					score    = score,
+				}
 			end
 		end
 	end
-	for _,def in pairs(awards.registered_awards) do
-		if not done[def.name] then
-			table.insert(retval,{name=def.name,got=false})
+
+	for _, def in pairs(awards.registered_awards) do
+		if not hash_is_unlocked[def.name] and def:can_unlock(data) then
+			local started = false
+			local score = def.difficulty or 1
+			if def.secret then
+				score = 1000000
+			elseif def.trigger and def.trigger.target and def.getProgress then
+				local progress = def:getProgress(data).perc
+				score = score * (1 - progress) * def.trigger.target
+				if progress < 0.001 then
+					score = score + 100
+				else
+					started = true
+				end
+			else
+				score = 100
+			end
+
+			retval[#retval + 1] = {
+				name     = def.name,
+				def      = def,
+				unlocked = false,
+				started  = started,
+				score    = score,
+			}
 		end
 	end
+
+	table.sort(retval, function(a, b)
+		return a.score < b.score
+	end)
 	return retval
 end

 function awards.get_formspec(name, to, sid)
 	local formspec = ""
-	local listofawards = order_awards(name)
-	local playerdata = awards.player(name)
+	local awards_list = order_awards(name)
+	local data  = awards.player(name)

-	if #listofawards == 0 then
-		formspec = formspec .. "label[3.9,1.5;"..minetest.formspec_escape(S("Error: No awards available.")).."]"
+	if #awards_list == 0 then
+		formspec = formspec .. "label[3.9,1.5;"..minetest.formspec_escape(S("Error: No achivements available.")).."]"
 		formspec = formspec .. "button_exit[4.2,2.3;3,1;close;"..minetest.formspec_escape(S("OK")).."]"
 		return formspec
 	end

 	-- Sidebar
 	if sid then
-		local item = listofawards[sid+0]
-		local def = awards.registered_awards[item.name]
+		local item = awards_list[sid+0]
+		local def  = item.def

-		if def and def.secret and not item.got then
-			formspec = formspec .. "label[1,2.75;"..minetest.formspec_escape(S("(Secret Award)")).."]"..
-								"image[1,0;3,3;awards_unknown.png]"
+		if def and def.secret and not item.unlocked then
+			formspec = formspec .. "label[1,2.75;"..
+					minetest.formspec_escape(S("(Secret Award)")).."]"..
+					"image[1,0;3,3;awards_unknown.png]"
 			if def and def.description then
-				formspec = formspec	.. "textarea[0.25,3.25;4.8,1.7;;"..minetest.formspec_escape(S("Unlock this award to find out what it is."))..";]"
+				formspec = formspec	.. "textarea[0.25,3.25;4.8,1.7;;"..
+						minetest.formspec_escape(
+								S("Unlock this award to find out what it is."))..";]"
 			end
 		else
 			local title = item.name
@@ -48,11 +96,11 @@ function awards.get_formspec(name, to, sid)
 				title = def.title
 			end
 			local status = "%s"
-			if item.got then
-				status = S("%s (got)")
+			if item.unlocked then
+				status = S("%s (unlocked)")
 			end

-      formspec = formspec .. "textarea[0.5,2.7;4.8,1.45;;" ..
+			formspec = formspec .. "textarea[0.5,2.7;4.8,1.45;;" ..
 				string.format(status, minetest.formspec_escape(title)) ..
 				";]"

@@ -62,8 +110,8 @@ function awards.get_formspec(name, to, sid)
 			local barwidth = 4.6
 			local perc = nil
 			local label = nil
-			if def.getProgress and playerdata then
-				local res = def:getProgress(playerdata)
+			if def.getProgress and data then
+				local res = def:getProgress(data)
 				perc = res.perc
 				label = res.label
 			end
@@ -86,25 +134,28 @@ function awards.get_formspec(name, to, sid)
 	-- Create list box
 	formspec = formspec .. "textlist[4.75,0;6,5;awards;"
 	local first = true
-	for _,award in pairs(listofawards) do
-		local def = awards.registered_awards[award.name]
+	for _, award in pairs(awards_list) do
+		local def = award.def
 		if def then
 			if not first then
 				formspec = formspec .. ","
 			end
 			first = false

-			if def.secret and not award.got then
+			if def.secret and not award.unlocked then
 				formspec = formspec .. "#707070"..minetest.formspec_escape(S("(Secret Award)"))
 			else
 				local title = award.name
 				if def and def.title then
 					title = def.title
 				end
-				if award.got then
+				-- title = title .. " [" .. award.score .. "]"
+				if award.unlocked then
 					formspec = formspec .. minetest.formspec_escape(title)
+				elseif award.started then
+					formspec = formspec .. "#c0c0c0".. minetest.formspec_escape(title)
 				else
-					formspec = formspec .. "#ACACAC".. minetest.formspec_escape(title)
+					formspec = formspec .. "#a0a0a0".. minetest.formspec_escape(title)
 				end
 			end
 		end
@@ -119,13 +170,13 @@ function awards.show_to(name, to, sid, text)
 	end
 	local data = awards.player(to)
 	if name == to and data.disabled then
-		minetest.chat_send_player(S("You've disabled awards. Type /awards enable to reenable."))
+		minetest.chat_send_player(name, S("You've disabled awards. Type /awards enable to reenable."))
 		return
 	end
 	if text then
-		local listofawards = order_awards(name)
-		if #listofawards == 0 then
-			minetest.chat_send_player(to, S("Error: No awards available."))
+		local awards_list = order_awards(name)
+		if #awards_list == 0 then
+			minetest.chat_send_player(to, S("Error: No award available."))
 			return
 		elseif not data or not data.unlocked  then
 			minetest.chat_send_player(to, S("You have not unlocked any awards."))
@@ -133,7 +184,7 @@ function awards.show_to(name, to, sid, text)
 		end
 		minetest.chat_send_player(to, string.format(S("%s’s awards:"), name))

-		for _, str in pairs(data.unlocked) do
+		for str, _ in pairs(data.unlocked) do
 			local def = awards.registered_awards[str]
 			if def then
 				if def.title then
@@ -168,6 +219,10 @@ if minetest.get_modpath("sfinv") then
 		on_enter = function(self, player, context)
 			context.awards_idx = 1
 		end,
+		is_in_nav = function(self, player, context)
+			local data = awards.player(player:get_player_name())
+			return not data.disabled
+		end,
 		get = function(self, player, context)
 			local name = player:get_player_name()
 			return sfinv.make_formspec(player, context,
--- a/init.lua
+++ b/init.lua
@@ -1,18 +1,4 @@
-- AWARDS
--
-- Copyright (C) 2013-2015 rubenwardy
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU Lesser General Public License as published by
-- the Free Software Foundation; either version 2.1 of the License, or
-- (at your option) any later version.
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- GNU Lesser General Public License for more details.
-- You should have received a copy of the GNU Lesser General Public License along
-- with this program; if not, write to the Free Software Foundation, Inc.,
-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--
+-- Copyright (c) 2013-18 rubenwardy. MIT.

 -- The global award namespace
 awards = {
@@ -31,13 +17,14 @@ dofile(minetest.get_modpath("awards").."/triggers.lua")
 dofile(minetest.get_modpath("awards").."/awards.lua")

 -- Backwards compatibility
-awards.give_achievement = awards.unlock
-awards.getFormspec      = awards.get_formspec
-awards.showto           = awards.show_to
-awards.register_onDig   = awards.register_on_dig
-awards.register_onPlace = awards.register_on_place
-awards.register_onDeath = awards.register_on_death
-awards.register_onChat  = awards.register_on_chat
-awards.register_onJoin  = awards.register_on_join
-awards.register_onCraft = awards.register_on_craft
-awards.def              = awards.registered_awards
+awards.give_achievement     = awards.unlock
+awards.getFormspec          = awards.get_formspec
+awards.showto               = awards.show_to
+awards.register_onDig       = awards.register_on_dig
+awards.register_onPlace     = awards.register_on_place
+awards.register_onDeath     = awards.register_on_death
+awards.register_onChat      = awards.register_on_chat
+awards.register_onJoin      = awards.register_on_join
+awards.register_onCraft     = awards.register_on_craft
+awards.def                  = awards.registered_awards
+awards.register_achievement = awards.register_award
--- a/intllib.lua
+++ b/intllib.lua
@@ -1,4 +1,3 @@
-
 -- Fallback functions for when `intllib` is not installed.
 -- Code released under Unlicense <http://unlicense.org>.

--- a/mod.conf
+++ b/mod.conf
@@ -1,8 +1,8 @@
 name = awards
-title = Achievements
+title = Awards
 author = rubenwardy
-description = Adds achievements to Minetest, and an API to register new ones.
-optional_depends = intllib,sfinv,unified_inventory,default,stairs,farming,dye,beds,wool,vessels,moreblocks,fire,flowers
-license = LGPLv2.1+
+description = Adds awards to Minetest, and an API to register new ones.
+optional_depends = intllib,sfinv,unified_inventory,default,stairs,farming,dye,beds,wool,vessels,moreblocks,fire,flowers,nyancat
+license = MIT
 forum = https://forum.minetest.net/viewtopic.php?t=4870
-version = 2.3.0
+version = 3.0.0
--- a/triggers.lua
+++ b/triggers.lua
@@ -107,7 +107,7 @@ awards.register_trigger("craft", {
 	end
 })
 minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
-	if not player or itemstack:empty() then
+	if not player or itemstack:is_empty() then
 		return
 	end

@@ -127,7 +127,7 @@ awards.register_trigger("eat", {
 	end
 })
 minetest.register_on_item_eat(function(_, _, itemstack, player, _)
-	if not player or itemstack:empty() then
+	if not player or itemstack:is_empty() then
 		return
 	end

@@ -135,3 +135,63 @@ minetest.register_on_item_eat(function(_, _, itemstack, player, _)
 	itemname = minetest.registered_aliases[itemname] or itemname
 	awards.notify_craft(player, itemname, itemstack:get_count())
 end)
+
+-- trigger for killing entities with more than 1 point of health
+awards.register_trigger("kill_mob", {
+	type = "counted_key",
+	progress = "@1/@2 killed",
+	auto_description = { "Kill @2", "Kill @1×@2" },
+	auto_description_total = { "Kill @1 mob", "Kill @1 mobs." },
+	get_key = function(self, def)
+		return minetest.registered_aliases[def.trigger.mob] or def.trigger.mob
+	end
+})
+
+-- wait for all mobs to be registered
+minetest.after(0, function()
+	local ents = minetest.registered_entities
+	local mobs = {}
+	for _, ent in pairs(ents) do
+		if ent.hp_max ~= nil and ent.hp_max > 0 then
+         		table.insert(mobs,ent)
+      		end
+	end
+	for _, mob in pairs(mobs) do
+		local old_func = mob.on_punch
+		mob.on_punch = function(self, player, a, b, c, d)
+			old_func(self, player, a, b, c, d)
+			if player and player:is_player() then
+				if self.health <= 0 then
+					awards.notify_kill_mob(player, self.name)
+				end
+			end
+		end
+	end
+end)
+
+-- trigger for killing an entity
+awards.register_trigger("punch_entity", {
+	type = "counted_key",
+	progress = "@1/@2 punched",
+	auto_description = { "Punch @2", "Punch @1×@2" },
+	auto_description_total = { "Punch @1 entity", "Punch @1 entities." },
+	get_key = function(self, def)
+		return minetest.registered_aliases[def.trigger.mob] or def.trigger.mob
+	end
+})
+
+-- wait for all entities to be registered
+minetest.after(0, function()
+	local ents = minetest.registered_entities
+	for _, ent in pairs(ents) do
+		if ent.hp_max == nil then
+			local old_func = ent.on_punch
+			ent.on_punch = function(self, player, a, b, c, d)
+				old_func(self, player, a, b, c, d)
+				if player and player:is_player() then
+					awards.notify_punch_entity(player, self.name)
+				end
+			end
+		end
+	end
+end)
Author	SHA1	Message	Date
Methacrylon	95991ce94f	Typo	2018-06-14 08:11:18 +02:00
Methacrylon	7a7ddc88af	Add test award for punch entity	2018-06-14 08:09:21 +02:00
Methacrylon	d25e638cfb	Add kill_mob and punch_entity triggers; it's now possible to create awards for killing mobs and punching entities	2018-06-14 07:54:44 +02:00
heavygale	21e1ce6675	Fix convert_data crash when craft data is missing Crash occurs when no data for "craft" is available in the old data, fixed with a additional check.	2018-05-31 15:06:56 +01:00
rubenwardy	0ae58ad0c3	Fix locked awards not taking difficulty into account	2018-04-17 22:37:09 +01:00
rubenwardy	7d462c6aa5	Add difficulty multiplers to default mod awards	2018-04-17 22:29:13 +01:00
rubenwardy	f0052386c8	Add award difficulty multipler	2018-04-17 22:25:53 +01:00
rubenwardy	08f654cf94	Remove debug prints Fixes #57	2018-04-17 22:10:40 +01:00
rubenwardy	3fc12eb689	Update README.md	2018-04-06 22:12:56 +01:00
rubenwardy	98fca7914b	Add on_unlock() documentation	2018-04-06 22:11:08 +01:00
rubenwardy	37275963df	Fix notification positioning Fixes #55, also fixes @Fixer-007	2018-04-06 00:24:56 +01:00
rubenwardy	75c01a188a	Replace all mentions of achievements with awards	2018-04-05 17:56:01 +01:00
rubenwardy	a5768efbc0	Fix awards disabling Fixes #33	2018-04-05 17:24:42 +01:00
rubenwardy	4e6ade249e	Use awards for technical things, and achievements for user facing things Fixes #18	2018-04-05 17:11:51 +01:00
rubenwardy	e110bbbc7a	Add award unlock requirements Fixes #52	2018-04-05 17:00:48 +01:00
rubenwardy	2f49d895ed	Fix typo in previous commit	2018-04-05 16:48:33 +01:00
rubenwardy	d67d19ec50	Improve sorting algorithm Fixes #28	2018-04-05 16:44:22 +01:00
rubenwardy	4764568f6d	Fix off-by-one error in counted_key award types	2018-04-05 16:21:44 +01:00
rubenwardy	ee4931ae6e	Add assert to awards.player()	2018-04-05 13:06:09 +01:00
rubenwardy	51ccb8c1b6	Fix crash caused by typo in method name Fixes #51	2018-04-05 09:48:35 +01:00
rubenwardy	7f156db0df	Add check for nyancat mod before registering the award Fixes #44	2018-04-04 23:05:25 +01:00
rubenwardy	0017a174bd	Change license to MIT	2018-04-04 22:57:27 +01:00