diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..4bc3040 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,24 @@ +Version 2.2: +- "Hit detection" based on spearhead position +- Spears go through buildable_to nodes (snow) +- Ugly fix to not collide in air above slabs (works only if slabs are not rotated) + +Version 2.1: +- Spears ding hard blocks (cracky < 3) +- Fixed stick-into-node position to avoid spears turning black (#2467) +- Player velocity added to throw (it's physics baby) + +Version 2.0: +- Cleaner, streamlined code without deprecated functions +- Spears hurt players +- Spears animated in flight +- Spears stick into nodes +- New textures +- New sound when hitting flesh +- New receipt to fit with default tools +- Drag depends on fluid +- Improved instructions +- New gold-plated spear to celebrate + +Version 1.1: +- Make use of new on_secondary_use API, requires Minetest 5.2.0 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..68bd9ae --- /dev/null +++ b/LICENSE @@ -0,0 +1,507 @@ +Sourcecode: LGPLv2.1 (see below) +Grahpics & sounds: CC-BY 3.0 (see http://creativecommons.org/licenses/by/3.0/legalcode) + + 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. + + spears + Copyright (C) 2020 Andrea Plati + + 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! diff --git a/README b/README new file mode 100644 index 0000000..9c02ecf --- /dev/null +++ b/README @@ -0,0 +1,25 @@ +=== SPEARS for MINETEST by Echoes91 === + +This mod adds spears to Minetest. + +How to download: +If you have this file, you already know + +Forum topic: +https://forum.minetest.net/viewtopic.php?f=11&t=13367 + +How to install: +http://wiki.minetest.com/wiki/Installing_Mods + +How to use the mod: +Craft a spear with | stick | stick | (material) |, works also mirrored. +Spears can be thrown using right mouse button, they either hurt someone or stick where they land on; damage depends on speed and material, flight trajectory is ballistic with (unrealistic) drag. +Spears can be used to fight, but are slower and weaker than swords. +Spears can be used to dig, but are slower and weaker and pickaxes. +If you miss the target it's your fault, the spear is fine. +You can grab a spear on the fly (or maybe wait until it falls?). +You can stick a spear into a block, but if you remove the block then the spear falls (obviously). +This mod contains the word "spear" more than 100 times, if you want the exact number count them yourself. +If you feel clever, throw a spear right above you and look at it to see what happens. +You can even throw a spear from above down to your foes, it's even easier to hit. +Someone once reported to have hit its own foot but it takes practice to do that. diff --git a/README.txt b/README.txt deleted file mode 100644 index 2701a2a..0000000 --- a/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -=== SPEARS for MINETEST === - -This mod adds spears to Minetest. It aims at improving the ones introduced within throwing enhanced. - -How to install: -http://wiki.minetest.com/wiki/Installing_Mods - -How to use the mod: -Spear work similarly to other tools such as swords, even if being a little slower. Moreover, a spear can be thrown using the drop key ('Q') or placed on a node using the place key ('right click'); they have also limited digging capabilities. - -License: -Sourcecode: LGPLv2.1 (see http://www.gnu.org/licenses/lgpl-2.1.html) -Grahpics & sounds: CC-BY 3.0 (see http://creativecommons.org/licenses/by/3.0/legalcode) \ No newline at end of file diff --git a/functions.lua b/functions.lua index 15de0c0..28be11b 100644 --- a/functions.lua +++ b/functions.lua @@ -1,77 +1,129 @@ -function spears_shot (itemstack, player) +function spears_throw (itemstack, player, pointed_thing) local spear = itemstack:get_name() .. '_entity' - local playerpos = player:getpos() - local obj = minetest.add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, spear) - local dir = player:get_look_dir() - local sp = 16 - local dr = .3 - local gravity = 9.8 - obj:setvelocity({x=dir.x*sp, y=dir.y*sp, z=dir.z*sp}) - obj:setacceleration({x=-dir.x*dr, y=-gravity, z=-dir.z*dr}) - obj:setyaw(player:get_look_yaw()+math.pi) - minetest.sound_play("spears_sound", {pos=playerpos}) - obj:get_luaentity().wear = itemstack:get_wear() + local player_pos = player:get_pos() + local head_pos = vector.new(player_pos.x, player_pos.y + player:get_properties().eye_height, player_pos.z) + local direction = player:get_look_dir() + local throw_pos = vector.add(head_pos, vector.multiply(direction,0.5)) + local pitch = player:get_look_vertical() + local yaw = player:get_look_horizontal() + local rotation = vector.new(0, yaw + math.pi/2, pitch + math.pi/6) + -- Plant into node + if pointed_thing.type == "node" then + local node = minetest.get_node(pointed_thing.under) + if minetest.registered_nodes[node.name].walkable and vector.distance(pointed_thing.above, throw_pos) < 1 then + local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_thing.above, 2), pointed_thing.under), 3), spear) + spear_object:set_rotation(rotation) + spear_object:get_luaentity()._wear = itemstack:get_wear() + spear_object:get_luaentity()._stickpos = pointed_thing.under + return + end + end + -- Avoid hitting yourself and throw + local throw_speed = 12 + while vector.distance(player_pos, throw_pos) < 1.2 do + throw_pos = vector.add(throw_pos, vector.multiply(direction, 0.1)) + end + local player_vel = player:get_player_velocity() + local spear_object = minetest.add_entity(throw_pos, spear) + spear_object:set_velocity(vector.add(player_vel, vector.multiply(direction, throw_speed))) + spear_object:set_rotation(rotation) + minetest.sound_play("spears_throw", {pos = player_pos}, true) + spear_object:get_luaentity()._wear = itemstack:get_wear() + spear_object:get_luaentity()._stickpos = nil return true end -function spears_set_entity(kind, eq, toughness) +function spears_set_entity(spear_type, base_damage, toughness) local SPEAR_ENTITY={ - physical = false, - timer=0, - visual = "wielditem", - visual_size = {x=0.15, y=0.1}, - textures = {"spears:spear_" .. kind}, - lastpos={}, - collisionbox = {0,0,0,0,0,0}, - on_punch = function(self, puncher) - if puncher then - if puncher:is_player() then - local stack = {name='spears:spear_' .. kind, wear=self.wear+65535/toughness} - local inv = puncher:get_inventory() - if inv:room_for_item("main", stack) then - inv:add_item("main", stack) + initial_properties = { + physical = false, + visual = "item", + visual_size = {x = 0.3, y = 0.3, z = 0.3}, + wield_item = "spears:spear_" .. spear_type, + collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3}, + }, + + on_activate = function (self, staticdata, dtime_s) + self.object:set_armor_groups({immortal = 1}) + end, + + on_punch = function (self, puncher) + if puncher:is_player() then -- Grab the spear + local stack = {name='spears:spear_' .. spear_type, wear = self._wear} + local inv = puncher:get_inventory() + if inv:room_for_item("main", stack) then + inv:add_item("main", stack) + self.object:remove() + end + end + end, + + on_step = function(self, dtime) + if not self._wear then + self.object:remove() + return + end + local velocity = self.object:get_velocity() + local speed = vector.length(velocity) + -- Spear is stuck ? + if self._stickpos then + local node = minetest.get_node(self._stickpos) + local node_cracky = minetest.registered_nodes[node.name].groups.cracky + if node_cracky and node_cracky < 3 then + minetest.sound_play("default_metal_footstep", {pos = pos}, true) + self.object:remove() + minetest.add_item(self.object:get_pos(), {name='spears:spear_' .. spear_type, wear = self._wear}) + elseif not self._node_walkable then + minetest.sound_play("default_place_node", {pos = throw_pos}, true) + end + self._node_walkable = minetest.registered_nodes[node.name].walkable + if not node or not self._node_walkable then -- Fall when node is removed + self.object:remove() + minetest.add_item(self.object:get_pos(), {name='spears:spear_' .. spear_type, wear = self._wear}) + return + end + else -- Spear is flying + local direction = vector.normalize(velocity) + local yaw = minetest.dir_to_yaw(direction) + local pitch = math.acos(velocity.y/speed) - math.pi/3 + local pos = self.object:get_pos() + local spearhead_pos = vector.add(pos, vector.multiply(direction, 0.5)) + local node = minetest.get_node(spearhead_pos) + self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch}) + -- Hit someone? + local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 0.6) + for _,object in ipairs(objects_in_radius) do + if object:get_luaentity() ~= self and object:get_armor_groups().fleshy then + local damage = (speed + base_damage)^1.15 - 20 + object:punch(self.object, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy=damage},}, direction) self.object:remove() + minetest.sound_play("spears_hit", {pos = pos}, true) + minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear + 65535/toughness}) + return end end + -- Hit a node? + if node and minetest.registered_nodes[node.name].walkable + and not minetest.registered_nodes[node.name].buildable_to + and not (minetest.registered_nodes[node.name].groups.slab and spearhead_pos.y % 1 < 0.5) + then -- Stick + self.object:set_acceleration({x = 0, y = 0, z = 0}) + self.object:set_velocity({x = 0, y = 0, z = 0}) + self._wear = self._wear + 65535/toughness + if self._wear >= 65535 then + minetest.sound_play("default_tool_breaks", {pos = pos}, true) + self.object:remove() + return + end + self._stickpos = spearhead_pos + else -- Get drag + local drag = math.max(minetest.registered_nodes[node.name].liquid_viscosity, 0.1) + local acceleration = vector.multiply(velocity, -drag) + acceleration.y = acceleration.y - 10 * ((7 - drag) / 7) + self.object:set_acceleration(acceleration) + end end end, } - - SPEAR_ENTITY.on_step = function(self, dtime) - self.timer=self.timer+dtime - local pos = self.object:getpos() - local node = minetest.get_node(pos) - if not self.wear then - self.object:remove() - return - end - if self.lastpos.x~=nil then - if node.name ~= "air" and not (string.find(node.name, 'grass') and not string.find(node.name, 'dirt')) and not string.find(node.name, 'flowers:') and not string.find(node.name, 'farming:') then - self.object:remove() - if self.wear+65535/toughness < 65535 then - minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness}) - end - elseif self.timer>0.2 then - local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1) - for k, obj in pairs(objs) do - if obj:get_luaentity() ~= nil then - if obj:get_luaentity().name ~= "spears:spear_" .. kind .. "_entity" and obj:get_luaentity().name ~= "__builtin:item" then - local speed = vector.length(self.object:getvelocity()) - local damage = (speed + eq)^1.12-20 - obj:punch(self.object, 1.0, { - full_punch_interval=1.0, - damage_groups={fleshy=damage}, - }, nil) - self.object:remove() - if self.wear+65535/toughness < 65535 then - minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness}) - end - end - end - end - end - end - self.lastpos={x=pos.x, y=pos.y, z=pos.z} - end return SPEAR_ENTITY end diff --git a/screenshot.png b/screenshot.png deleted file mode 100644 index 225b1aa..0000000 Binary files a/screenshot.png and /dev/null differ diff --git a/sounds/spears_hit.ogg b/sounds/spears_hit.ogg new file mode 100644 index 0000000..d5b681c Binary files /dev/null and b/sounds/spears_hit.ogg differ diff --git a/sounds/spears_sound.ogg b/sounds/spears_sound.ogg deleted file mode 100644 index 411598c..0000000 Binary files a/sounds/spears_sound.ogg and /dev/null differ diff --git a/sounds/spears_throw.ogg b/sounds/spears_throw.ogg new file mode 100644 index 0000000..ed1d993 Binary files /dev/null and b/sounds/spears_throw.ogg differ diff --git a/spears_screenshot.png b/spears_screenshot.png new file mode 100644 index 0000000..d0e3909 Binary files /dev/null and b/spears_screenshot.png differ diff --git a/textures/spears_spear_bronze.png b/textures/spears_spear_bronze.png index 3993e45..0032b03 100644 Binary files a/textures/spears_spear_bronze.png and b/textures/spears_spear_bronze.png differ diff --git a/textures/spears_spear_copper.png b/textures/spears_spear_copper.png index 56b1ff9..b72e61e 100644 Binary files a/textures/spears_spear_copper.png and b/textures/spears_spear_copper.png differ diff --git a/textures/spears_spear_diamond.png b/textures/spears_spear_diamond.png index 7a852b9..975fb9c 100644 Binary files a/textures/spears_spear_diamond.png and b/textures/spears_spear_diamond.png differ diff --git a/textures/spears_spear_gold.png b/textures/spears_spear_gold.png new file mode 100644 index 0000000..8297849 Binary files /dev/null and b/textures/spears_spear_gold.png differ diff --git a/textures/spears_spear_obsidian.png b/textures/spears_spear_obsidian.png index 6ec0ab4..4e4e565 100644 Binary files a/textures/spears_spear_obsidian.png and b/textures/spears_spear_obsidian.png differ diff --git a/textures/spears_spear_steel.png b/textures/spears_spear_steel.png index 1fa930c..fae7e12 100644 Binary files a/textures/spears_spear_steel.png and b/textures/spears_spear_steel.png differ diff --git a/textures/spears_spear_stone.png b/textures/spears_spear_stone.png index fead8b3..dac21d8 100644 Binary files a/textures/spears_spear_stone.png and b/textures/spears_spear_stone.png differ diff --git a/tools.lua b/tools.lua index c47f858..49b5af4 100644 --- a/tools.lua +++ b/tools.lua @@ -1,19 +1,19 @@ -function spears_register_spear(kind, desc, eq, toughness, material) +function spears_register_spear(spear_type, desc, base_damage, toughness, material) - minetest.register_tool("spears:spear_" .. kind, { + minetest.register_tool("spears:spear_" .. spear_type, { description = desc .. " spear", - wield_image = "spears_spear_" .. kind .. ".png", - inventory_image = "spears_spear_" .. kind .. ".png^[transform4", - wield_scale= {x=2,y=1,z=1}, - on_drop = function(itemstack, user, pointed_thing) - spears_shot(itemstack, user) + wield_image = "spears_spear_" .. spear_type .. ".png^[transform4", + inventory_image = "spears_spear_" .. spear_type .. ".png", + wield_scale= {x = 1.5, y = 1.5, z = 1.5}, + on_secondary_use = function(itemstack, user, pointed_thing) + spears_throw(itemstack, user, pointed_thing) if not minetest.setting_getbool("creative_mode") then itemstack:take_item() end return itemstack end, on_place = function(itemstack, user, pointed_thing) - minetest.add_item(pointed_thing.above, itemstack) + spears_throw(itemstack, user, pointed_thing) if not minetest.setting_getbool("creative_mode") then itemstack:take_item() end @@ -25,26 +25,27 @@ function spears_register_spear(kind, desc, eq, toughness, material) groupcaps={ cracky = {times={[3]=2}, uses=toughness, maxlevel=1}, }, - damage_groups = {fleshy=eq}, - } + damage_groups = {fleshy=base_damage}, + }, + sound = {breaks = "default_tool_breaks"}, + groups = {flammable = 1} }) - minetest.register_entity( - "spears:spear_" .. kind .. "_entity", - spears_set_entity(kind, eq, toughness) - ) + local SPEAR_ENTITY = spears_set_entity(spear_type, base_damage, toughness) + + minetest.register_entity("spears:spear_" .. spear_type .. "_entity", SPEAR_ENTITY) minetest.register_craft({ - output = 'spears:spear_' .. kind, + output = 'spears:spear_' .. spear_type, recipe = { - {'group:wood', 'group:wood', material}, + {'group:stick', 'group:stick', material}, } }) minetest.register_craft({ - output = 'spears:spear_' .. kind, + output = 'spears:spear_' .. spear_type, recipe = { - {material, 'group:wood', 'group:wood'}, + {material, 'group:stick', 'group:stick'}, } }) end @@ -72,3 +73,7 @@ end if not DISABLE_DIAMOND_SPEAR then spears_register_spear('diamond', 'Diamond', 8, 40, 'default:diamond') end + +if not DISABLE_GOLD_SPEAR then + spears_register_spear('gold', 'Golden', 5, 40, 'default:gold_ingot') +end