update to bobs version

This commit is contained in:
Elkien3 2018-10-26 19:38:28 -05:00
parent 550316611f
commit 0943e48525
16 changed files with 1541 additions and 596 deletions

521
mods/factions/LICENSE Normal file
View File

@ -0,0 +1,521 @@
License of source code under old team.
------------ Begin ------------
License WTFPL
Copyright (C) 2013-2016 Sapier, agrecascino, shamoanjac
------------ End ------------
License of media.
------------ Begin ------------
following Textures created by Coder12a (CC BY-SA 3.0):
factions_display.png
------------ End ------------
License of source code under new team.
------------ Begin ------------
Copyright (C) 2018 Coder12a
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!
------------ End ------------

50
mods/factions/README.md Normal file
View File

@ -0,0 +1,50 @@
# factions
mod for minetest
Mod for handling in game factions and reputation.
# TODO LIST
Redo the parcel attack system.
Add command to show or hide all parcel position locations as markers.
Add money.
Player tax.
faction territory titles.
More claim and unclaim commands.
faction access manage command.
More permissions.
faction flags(Not to replace parcels).
Maybe expand on diplomacy.
Write the forum topic better.
Add command to set the faction message of the day.
Code clean up and optimization.
# COMPLETED BUT NEEDS TESTING LIST
None.
# COMPLETED
Make factions power max based on how many players are in the team, and players with the same ip address can not add to the power max.
Make factions without parcels disband after a few hours.
Complete the diplomacy system.
Make claim's depth not go to high or low. Or make it act like a protection block where you have to claim land upwards and downwards.
Add a show claim command (show small entity boxes like in protection mod).
Remove banner code.

View File

@ -1,104 +0,0 @@
-- nodes
--[[minetest.register_node("factions:power_banner", {
drawtype = "normal",
tiles = {"power_banner.png"},
description = "Power Banner",
groups = {cracky=3},
diggable = true,
stack_max = 1,
paramtype = "light",
paramtype2 = "facedir",
after_place_node = function (pos, player, itemstack, pointed_thing)
after_powerbanner_placed(pos, player, itemstack, pointed_thing)
end,
on_dig = function(pos, n, p)
if minetest.is_protected(pos, p:get_player_name()) then
return
end
local meta = minetest.get_meta(pos)
local facname = meta:get_string("faction")
if facname then
local faction = factions.factions[facname]
if faction then
faction:decrease_maxpower(config.power_per_banner)
end
end
minetest.node_dig(pos, n, p)
end,
})
minetest.register_node("factions:death_banner", {
drawtype = "normal",
tiles = {"death_banner.png"},
description = "Death Banner",
groups = {cracky=3},
diggable = true,
stack_max = 1,
paramtype = "light",
paramtype2 = "facedir",
after_place_node = function (pos, player, itemstack, pointed_thing)
after_deathbanner_placed(pos, player, itemstack, pointed_thing)
end,
on_dig = function(pos, n, p)
if minetest.is_protected(pos, p:get_player_name()) then
return
end
local meta = minetest.get_meta(pos)
local defending_facname = meta:get_string("faction")
local parcelpos = factions.get_parcel_pos(pos)
if defending_facname then
local faction = factions.factions[defending_facname]
if faction then
faction:stop_attack(parcelpos)
end
end
minetest.remove_node(pos)
end,
})
after_powerbanner_placed = function(pos, player, itemstack, pointed_thing)
--minetest.get_node(pos).param2 = determine_flag_direction(pos, pointed_thing)
local faction = factions.players[player:get_player_name()]
if not faction then
minetest.get_meta(pos):set_string("banner", "bg_white.png")
else
local banner_string = "bg_white.png"--factions[faction].banner
minetest.get_meta(pos):set_string("banner", banner_string)
minetest.get_meta(pos):set_string("faction", faction)
factions.factions[faction]:increase_maxpower(config.power_per_banner)
end
end
after_deathbanner_placed = function(pos, player, itemstack, pointed_thing)
-- minetest.get_node(pos).param2 = determine_flag_direction(pos, pointed_thing)
local attacking_faction = factions.players[player:get_player_name()]
if attacking_faction ~= nil then
local parcelpos = factions.get_parcel_pos(pos)
attacking_faction = factions.factions[attacking_faction]
if not attacking_faction:attack_parcel(parcelpos) then return false end
minetest.get_meta(pos):set_string("faction", attacking_faction.name)
end
minetest.get_meta(pos):set_string("banner", "death_uv.png")
end
if minetest.get_modpath("default") then
minetest.register_craft({
output = 'factions:power_banner',
recipe = {
{'default:mese_crystal','default:mese_crystal','default:mese_crystal'},
{'default:mese_crystal','default:diamondblock','default:mese_crystal'},
{'default:mese_crystal','default:mese_crystal','default:mese_crystal'}
}
})
end
if minetest.get_modpath("default") and minetest.get_modpath("bones") then
minetest.register_craft({
output = 'factions:death_banner',
recipe = {
{'default:obsidian','default:obsidian','default:obsidian'},
{'default:obsidian','bones:bones','default:obsidian'},
{'default:obsidian','default:obsidian','default:obsidian'}
}
})
end--]]

View File

@ -1,17 +1,3 @@
-------------------------------------------------------------------------------
-- factions Mod by Sapier
--
-- License WTFPL
--
--! @file chatcommnd.lua
--! @brief factions chat interface
--! @copyright Sapier, agrecascino, shamoanjac, Coder12a
--! @author Sapier, agrecascino, shamoanjac, Coder12a
--! @date 2016-08-12
--
-- Contact sapier a t gmx net
-------------------------------------------------------------------------------
local send_error = function(player, message)
minetest.chat_send_player(player, message)
end
@ -29,22 +15,23 @@ factions.register_command = function(cmd_name, cmd, ignore_param_count)
infaction = true,
description = "This command has no description.",
run = function(self, player, argv)
--if self.global_privileges then
-- local tmp = {}
-- for i in ipairs(self.global_privileges) do
-- tmp[self.global_privileges[i]] = true
-- end
-- local bool, missing_privs = minetest.check_player_privs(player, tmp)
-- if not bool then
-- send_error(player, "Unauthorized.")
-- return false
-- end
--end
if self.global_privileges then
local tmp = {}
for i in ipairs(self.global_privileges) do
tmp[self.global_privileges[i]] = true
end
local bool, missing_privs = minetest.check_player_privs(player, tmp)
if not bool then
send_error(player, "Unauthorized.")
return false
end
end
-- checks argument formats
local args = {
factions = {},
players = {},
strings = {},
unknowns = {},
other = {}
}
if not ignore_param_count then
@ -77,7 +64,7 @@ factions.register_command = function(cmd_name, cmd, ignore_param_count)
table.insert(args.factions, fac)
end
elseif argtype == "player" then
local pl = arg--minetest.get_player_by_name(arg)
local pl = minetest.get_player_by_name(arg)
if not pl and not factions.players[arg] then
send_error(player, "Player is not online.")
return false
@ -87,9 +74,10 @@ factions.register_command = function(cmd_name, cmd, ignore_param_count)
elseif argtype == "string" then
table.insert(args.strings, arg)
else
minetest.log("error", "Bad format definition for function "..self.name)
send_error(player, "Internal server error")
return false
table.insert(args.unknowns, arg)
--minetest.log("error", "Bad format definition for function "..self.name)
--send_error(player, "Internal server error")
--return false
end
end
for i=2, #argv do
@ -131,7 +119,7 @@ end
local init_commands
init_commands = function()
--[[
minetest.register_privilege("faction_user",
{
description = "this user is allowed to interact with faction mod",
@ -139,7 +127,7 @@ init_commands = function()
}
)
--]]
minetest.register_privilege("faction_admin",
{
description = "this user is allowed to create or delete factions",
@ -151,7 +139,7 @@ init_commands = function()
{
params = "<cmd> <parameter 1> .. <parameter n>",
description = "faction administration functions",
privs = { interact=true,}, --faction_user=true },
privs = { interact=true,faction_user=true },
func = factions_chat.cmdhandler,
}
)
@ -161,7 +149,7 @@ init_commands = function()
{
params = "<command> parameters",
description = "Factions commands. Type /f help for available commands.",
privs = { interact=true,},--faction_user=true},
privs = { interact=true,faction_user=true},
func = factions_chat.cmdhandler,
}
)
@ -175,7 +163,7 @@ end
factions.register_command ("claim", {
faction_permissions = {"claim"},
description = "Claim the plot of land you're on.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local can_claim = faction:can_claim_parcel(parcelpos)
if can_claim then
@ -184,8 +172,11 @@ factions.register_command ("claim", {
return true
else
local parcel_faction = factions.get_parcel_faction(parcelpos)
if not parcel_faction then
send_error(player, "You faction cannot claim any (more) parcel(s).")
if faction.power <= factions_config.power_per_parcel then
send_error(player, "Not enough power.")
return false
elseif not parcel_faction then
send_error(player, "Your faction cannot claim any (more) parcel(s).")
return false
elseif parcel_faction.name == faction.name then
send_error(player, "This parcel already belongs to your faction.")
@ -201,7 +192,7 @@ factions.register_command ("claim", {
factions.register_command("unclaim", {
faction_permissions = {"claim"},
description = "Unclaim the plot of land you're on.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local parcel_faction = factions.get_parcel_faction(parcelpos)
if not parcel_faction then
@ -222,7 +213,7 @@ factions.register_command("unclaim", {
factions.register_command("list", {
description = "List all registered factions.",
infaction = false,
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local list = factions.get_faction_list()
local tosend = "Existing factions:"
@ -251,7 +242,7 @@ factions.register_command("version", {
factions.register_command("info", {
format = {"faction"},
description = "Shows a faction's description.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player,
"factions: " .. args.factions[1].name .. ": " ..
@ -262,9 +253,8 @@ factions.register_command("info", {
factions.register_command("leave", {
description = "Leave your faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player, "You have left your Faction")
faction:remove_player(player)
return true
end
@ -274,19 +264,18 @@ factions.register_command("kick", {
faction_permissions = {"playerslist"},
format = {"player"},
description = "Kick a player from your faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local victim = args.players[1]
local victim_faction = factions.get_player_faction(victim)
if victim_faction and victim ~= faction.leader then -- can't kick da king
faction:remove_player(victim)
minetest.chat_send_player(player, "Kicked player '"..victim.."'.")
local victim_faction = factions.get_player_faction(victim:get_player_name())
if victim_faction and victim:get_player_name() ~= faction.leader then -- can't kick da king
faction:remove_player(victim:get_player_name())
return true
elseif not victim_faction then
send_error(player, victim.." is not in your faction.")
send_error(player, victim:get_player_name().." is not in your faction.")
return false
else
send_error(player, victim.." cannot be kicked from your faction.")
send_error(player, victim:get_player_name().." cannot be kicked from your faction.")
return false
end
end
@ -297,7 +286,7 @@ factions.register_command("create", {
format = {"string"},
infaction = false,
description = "Create a new faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
if faction then
send_error(player, "You are already in a faction.")
@ -307,7 +296,7 @@ factions.register_command("create", {
if factions.can_create_faction(factionname) then
new_faction = factions.new_faction(factionname, nil)
new_faction:add_player(player, new_faction.default_leader_rank)
minetest.chat_send_player(player, "Created Faction.")
factions.start_diplomacy(factionname,new_faction)
return true
else
send_error(player, "Faction cannot be created.")
@ -320,7 +309,7 @@ factions.register_command("join", {
format = {"faction"},
description = "Join a faction.",
infaction = false,
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local new_faction = args.factions[1]
if new_faction:can_join(player) then
@ -328,7 +317,6 @@ factions.register_command("join", {
faction:remove_player(player)
end
new_faction:add_player(player)
minetest.chat_send_player(player, "Joined Faction.")
else
send_error(player, "You cannot join this faction.")
return false
@ -340,9 +328,8 @@ factions.register_command("join", {
factions.register_command("disband", {
faction_permissions = {"disband"},
description = "Disband your faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player, "Disbanded Faction.")
faction:disband()
return true
end
@ -351,7 +338,7 @@ factions.register_command("disband", {
factions.register_command("close", {
faction_permissions = {"playerslist"},
description = "Make your faction invite-only.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:toggle_join_free(false)
return true
@ -361,7 +348,7 @@ factions.register_command("close", {
factions.register_command("open", {
faction_permissions = {"playerslist"},
description = "Allow any player to join your faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:toggle_join_free(true)
return true
@ -371,7 +358,7 @@ factions.register_command("open", {
factions.register_command("description", {
faction_permissions = {"description"},
description = "Set your faction's description",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:set_description(table.concat(args.other," "))
return true
@ -382,10 +369,9 @@ factions.register_command("invite", {
format = {"player"},
faction_permissions = {"playerslist"},
description = "Invite a player to your faction.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:invite_player(args.players[1])
minetest.chat_send_player(player, "Invite Sent.")
faction:invite_player(args.players[1]:get_player_name())
return true
end
},false)
@ -394,10 +380,9 @@ factions.register_command("uninvite", {
format = {"player"},
faction_permissions = {"playerslist"},
description = "Revoke a player's invite.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:revoke_invite(args.players[1])
minetest.chat_send_player(player, "Invite canceled.")
faction:revoke_invite(args.players[1]:get_player_name())
return true
end
},false)
@ -408,7 +393,6 @@ factions.register_command("delete", {
infaction = false,
description = "Delete a faction.",
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player, "Deleted Faction.")
args.factions[1]:disband()
return true
end
@ -416,7 +400,7 @@ factions.register_command("delete", {
factions.register_command("ranks", {
description = "List ranks within your faction",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
for rank, permissions in pairs(faction.ranks) do
minetest.chat_send_player(player, rank..": "..table.concat(permissions, " "))
@ -425,9 +409,284 @@ factions.register_command("ranks", {
end
},false)
factions.register_command("rank_privileges", {
description = "List available rank privileges.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player, "Privileges available:\n")
for i, k in pairs(factions.permissions) do
minetest.chat_send_player(player, k .. "\n")
end
return true
end
},false)
if factions_config.faction_diplomacy then
factions.register_command("send_alliance", {
description = "Send an alliance request to another faction.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if factions.factions[args.strings[1]] then
if not factions.factions[args.strings[1]].request_inbox[faction.name] then
if faction.allies[args.strings[1]] then
send_error(player, "You are already allys.")
return false
end
if faction.enemies[args.strings[1]] then
send_error(player, "You need to be neutral in-order to send an alliance request.")
return false
end
if args.strings[1] == faction.name then
send_error(player, "You can not send an alliance to your own faction.")
return false
end
if faction.request_inbox[args.strings[1]] then
send_error(player, "Faction " .. args.strings[1] .. "has already sent a request to you.")
return false
end
factions.factions[args.strings[1]].request_inbox[faction.name] = "alliance"
factions.factions[args.strings[1]]:broadcast("An alliance request from faction " .. faction.name .. " has been sent to you.")
faction:broadcast("An alliance request was sent to faction " .. args.strings[1])
factions.save()
else
send_error(player, "You have already sent a request.")
end
else
send_error(player, args.strings[1] .. " is not a name of a faction.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("send_neutral", {
description = "Send neutral to another faction.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if factions.factions[args.strings[1]] then
if not factions.factions[args.strings[1]].request_inbox[faction.name] then
if faction.allies[args.strings[1]] then
send_error(player, "You are allys.")
return false
end
if faction.neutral[args.strings[1]] then
send_error(player, "You are already neutral with this faction.")
return false
end
if args.strings[1] == faction.name then
send_error(player, "You can not send a neutral request to your own faction.")
return false
end
if faction.request_inbox[args.strings[1]] then
send_error(player, "Faction " .. args.strings[1] .. "has already sent a request to you.")
return false
end
factions.factions[args.strings[1]].request_inbox[faction.name] = "neutral"
factions.factions[args.strings[1]]:broadcast("A neutral request from faction " .. faction.name .. " has been sent to you.")
faction:broadcast("A neutral request was sent to faction " .. args.strings[1])
factions.save()
else
send_error(player, "You have already sent a request.")
end
else
send_error(player, args.strings[1] .. " is not a name of a faction.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("accept", {
description = "accept an request from another faction.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if faction.request_inbox[args.strings[1]] then
if args.strings[1] == faction.name then
send_error(player, "You can not accept an request from own faction.")
return false
end
if faction.request_inbox[args.strings[1]] == "alliance" then
faction:new_alliance(args.strings[1])
factions.factions[args.strings[1]]:new_alliance(faction.name)
else
if faction.request_inbox[args.strings[1]] == "neutral" then
faction:new_neutral(args.strings[1])
factions.factions[args.strings[1]]:new_neutral(faction.name)
end
end
faction.request_inbox[args.strings[1]] = nil
factions.save()
else
send_error(player, "No request was sent to you.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("refuse", {
description = "refuse an request from another faction.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if faction.request_inbox[args.strings[1]] then
if args.strings[1] == faction.name then
send_error(player, "You can not refuse an request from your own faction.")
return false
end
faction.request_inbox[args.strings[1]] = nil
factions.factions[args.strings[1]]:broadcast("Faction " .. faction.name .. " refuse to be your ally.")
faction:broadcast("Refused an request from faction " .. args.strings[1])
factions.save()
else
send_error(player, "No request was sent to you.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("delcare_war", {
description = "Delcare war on a faction.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if not faction.enemies[args.strings[1]] then
if args.strings[1] == faction.name then
send_error(player, "You can not delcare war on your own faction.")
return false
end
if faction.allies[args.strings[1]] then
faction:end_alliance(args.strings[1])
factions.factions[args.strings[1]]:end_alliance(faction.name)
end
if faction.neutral[args.strings[1]] then
faction:end_neutral(args.strings[1])
factions.factions[args.strings[1]]:end_neutral(faction.name)
end
faction:new_enemy(args.strings[1])
factions.factions[args.strings[1]]:new_enemy(faction.name)
factions.save()
else
send_error(player, "You are already at war.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("break", {
description = "Break an alliance.",
global_privileges = {"faction_user"},
format = {"string"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
if faction.allies[args.strings[1]] then
if args.strings[1] == faction.name then
send_error(player, "You can not break an alliance from your own faction.")
return false
end
faction:end_alliance(args.strings[1])
factions.factions[args.strings[1]]:end_alliance(faction.name)
faction:new_neutral(args.strings[1])
factions.factions[args.strings[1]]:new_neutral(faction.name)
factions.save()
else
send_error(player, "You where not allies to begin with.")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("inbox", {
description = "Check your diplomacy request inbox.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
if faction:has_permission(player, "diplomacy") then
local empty = true
for i,k in pairs(faction.request_inbox) do
if k == "alliance" then
minetest.chat_send_player(player,"Alliance request from faction " .. i .. "\n")
else
if k == "neutral" then
minetest.chat_send_player(player,"neutral request from faction " .. i .. "\n")
end
end
empty = false
end
if empty then
minetest.chat_send_player(player,"none:")
end
else
send_error(player, "You do not have the diplomacy privilege.")
end
end
},false)
factions.register_command("allies", {
description = "Shows the factions that are allied to you.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local empty = true
for i,k in pairs(faction.allies) do
minetest.chat_send_player(player,i .. "\n")
empty = false
end
if empty then
minetest.chat_send_player(player,"none:")
end
end
},false)
factions.register_command("neutral", {
description = "Shows the factions that are neutral with you.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local empty = true
for i,k in pairs(faction.neutral) do
minetest.chat_send_player(player,i .. "\n")
empty = false
end
if empty then
minetest.chat_send_player(player,"none:")
end
end
},false)
factions.register_command("enemies", {
description = "Shows enemies of your faction.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local empty = true
for i,k in pairs(faction.enemies) do
minetest.chat_send_player(player,i .. "\n")
empty = false
end
if empty then
minetest.chat_send_player(player,"none:")
end
end
},false)
end
factions.register_command("who", {
description = "List players in your faction, and their ranks.",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
if not faction.players then
minetest.chat_send_player(player, "There is nobody in this faction ("..faction.name..")")
@ -441,11 +700,31 @@ factions.register_command("who", {
end
},false)
local parcel_size_center = factions_config.parcel_size / 2
factions.register_command("showparcel", {
description = "Shows parcel for six seconds.",
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local parcel_faction = factions.get_parcel_faction(parcelpos)
if not parcel_faction then
send_error(player, "There is no claim here")
return false
end
local psc = parcel_size_center
local fps = factions_config.parcel_size
local ppos = {x = (math.floor(pos.x / fps)*fps)+psc,y = (math.floor(pos.y / fps)*fps)+psc,z = (math.floor(pos.z / fps)*fps)+psc}
minetest.add_entity(ppos, "factions:display")
return true
end
},false)
factions.register_command("newrank", {
description = "Add a new rank.",
format = {"string"},
faction_permissions = {"ranks"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
if args.strings[1] then
local rank = args.strings[1]
@ -489,7 +768,7 @@ factions.register_command("delrank", {
description = "Replace and delete a rank.",
format = {"string", "string"},
faction_permissions = {"ranks"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local rank = args.strings[1]
local newrank = args.strings[2]
@ -505,7 +784,7 @@ factions.register_command("delrank", {
factions.register_command("setspawn", {
description = "Set the faction's spawn",
faction_permissions = {"spawn"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
faction:set_spawn(pos)
return true
@ -515,7 +794,7 @@ factions.register_command("setspawn", {
factions.register_command("where", {
description = "See whose parcel you stand on.",
infaction = false,
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local parcel_faction = factions.get_parcel_faction(parcelpos)
local place_name = (parcel_faction and parcel_faction.name) or "Wilderness"
@ -527,7 +806,7 @@ factions.register_command("where", {
factions.register_command("help", {
description = "Shows help for commands.",
infaction = false,
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
factions_chat.show_help(player)
return true
@ -536,7 +815,7 @@ factions.register_command("help", {
factions.register_command("spawn", {
description = "Shows your faction's spawn",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local spawn = faction.spawn
if spawn then
@ -554,12 +833,11 @@ factions.register_command("promote", {
description = "Promotes a player to a rank",
format = {"player", "string"},
faction_permissions = {"promote"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local rank = args.strings[1]
if faction.ranks[rank] then
faction:promote(args.players[1], rank)
minetest.chat_send_player(player, "Promoted "..args.players[1] .. " to " .. rank .. "!")
faction:promote(args.players[1]:get_player_name(), rank)
return true
else
send_error(player, "The specified rank does not exist.")
@ -570,28 +848,13 @@ factions.register_command("promote", {
factions.register_command("power", {
description = "Display your faction's power",
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
minetest.chat_send_player(player, "Power: "..faction.power.."/"..faction.maxpower - faction.usedpower.."/"..faction.maxpower)
minetest.chat_send_player(player, "Power: "..faction.power.."/".. faction.usedpower .."/"..faction.maxpower)
return true
end
},false)
--[[
factions.register_command("setbanner", {
description = "Sets the banner you're on as the faction's banner.",
faction_permissions = {"banner"},
on_success = function(player, faction, pos, parcelpos, args)
local meta = minetest.get_meta({x = pos.x, y = pos.y - 1, z = pos.z})
local banner = meta:get_string("banner")
if not banner then
minetest.chat_send_player(player, "No banner found.")
return false
end
faction:set_banner(banner)
end
},false)
--]]
--[[
factions.register_command("convert", {
description = "Load factions in the old format",
infaction = false,
@ -606,7 +869,7 @@ factions.register_command("convert", {
return true
end
},false)
--]]
factions.register_command("free", {
description = "Forcefully frees a parcel",
infaction = false,
@ -626,7 +889,7 @@ factions.register_command("free", {
factions.register_command("chat", {
description = "Send a message to your faction's members",
format = {"string"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local msg = table.concat(args.strings, " ")
faction:broadcast(msg, player)
@ -645,7 +908,7 @@ factions.register_command("which", {
description = "Gets a player's faction",
infaction = false,
format = {"string"},
--global_privileges = {"faction_user"},
global_privileges = {"faction_user"},
on_success = function(player, faction, pos, parcelpos, args)
local playername = args.strings[1]
local faction = factions.get_player_faction(playername)
@ -665,7 +928,7 @@ factions.register_command("setleader", {
global_privileges = {"faction_admin"},
format = {"faction", "player"},
on_success = function(player, faction, pos, parcelpos, args)
local playername = args.players[1]
local playername = args.players[1]:get_player_name()
local playerfaction = factions.get_player_faction(playername)
local targetfaction = args.factions[1]
if playerfaction.name ~= targetfaction.name then
@ -732,7 +995,7 @@ factions.register_command("getspawn", {
factions.register_command("whoin", {
description = "Get all members of a faction.",
infaction = false,
--global_privileges = {"faction_admin"},
global_privileges = {"faction_admin"},
format = {"faction"},
on_success = function(player, faction, pos, parcelpos, args)
local msg = {}
@ -747,7 +1010,7 @@ factions.register_command("whoin", {
factions.register_command("stats", {
description = "Get stats of a faction.",
infaction = false,
--global_privileges = {"faction_admin"},
global_privileges = {"faction_admin"},
format = {"faction"},
on_success = function(player, faction, pos, parcelpos, args)
local f = args.factions[1]
@ -759,7 +1022,7 @@ factions.register_command("stats", {
factions.register_command("seen", {
description = "Check the last time a faction had a member logged in",
infaction = false,
--global_privileges = {"faction_admin"},
global_privileges = {"faction_admin"},
format = {"faction"},
on_success = function(player, faction, pos, parcelpos, args)
local lastseen = args.factions[1].last_logon

View File

@ -1,28 +1,46 @@
-------------------------------------------------------------------------------
-- factions Mod by Sapier
--
-- License WTFPL
--
--! @file config.lua
--! @brief settings file
--! @copyright Coder12a
--! @author Coder12a
--! @date 2018-03-13
--
-- Contact sapier a t gmx net
-------------------------------------------------------------------------------
config = {}
config.protection_max_depth = tonumber(minetest.setting_get("protection_max_depth")) or -20
config.power_per_parcel = tonumber(minetest.setting_get("power_per_parcel")) or 1
config.power_per_death = tonumber(minetest.setting_get("power_per_death")) or 0.25
config.power_per_tick = tonumber(minetest.setting_get("power_per_tick")) or 0.125
config.tick_time = tonumber(minetest.setting_get("tick_time")) or 60
config.power_per_attack = tonumber(minetest.setting_get("power_per_attack")) or 4
config.faction_name_max_length = tonumber(minetest.setting_get("faction_name_max_length")) or 50
config.rank_name_max_length = tonumber(minetest.setting_get("rank_name_max_length")) or 25
config.maximum_faction_inactivity = tonumber(minetest.setting_get("maximum_faction_inactivity")) or 604800
config.power = tonumber(minetest.setting_get("power")) or 1
config.maxpower = tonumber(minetest.setting_get("maxpower")) or 4
config.power_per_banner = minetest.settings:get("power_per_banner") or 1
config.attack_parcel = minetest.settings:get_bool("attack_parcel") or false
factions_config = {}
local flip = tonumber(minetest.settings:get("protection_max_depth")) or 512
factions_config.protection_max_depth = -flip
factions_config.protection_max_height = tonumber(minetest.settings:get("protection_max_height")) or 10000
factions_config.power_per_parcel = tonumber(minetest.settings:get("power_per_parcel")) or 1
factions_config.power_per_death = tonumber(minetest.settings:get("power_per_death")) or 1
factions_config.power_per_tick = tonumber(minetest.settings:get("power_per_tick")) or 2
factions_config.tick_time = tonumber(minetest.settings:get("tick_time")) or 60
factions_config.power_per_attack = tonumber(minetest.settings:get("power_per_attack")) or 10
factions_config.faction_name_max_length = tonumber(minetest.settings:get("faction_name_max_length")) or 50
factions_config.rank_name_max_length = tonumber(minetest.settings:get("rank_name_max_length")) or 25
factions_config.maximum_faction_inactivity = tonumber(minetest.settings:get("maximum_faction_inactivity")) or 604800
factions_config.maximum_parcelless_faction_time = tonumber(minetest.settings:get("maximum_parcelless_faction_time")) or 10800
factions_config.power = tonumber(minetest.settings:get("power")) or 0
factions_config.maxpower = tonumber(minetest.settings:get("maxpower")) or 0
factions_config.power_per_player = tonumber(minetest.settings:get("power_per_player")) or 1
factions_config.powermax_per_player = tonumber(minetest.settings:get("powermax_per_player")) or 12
factions_config.parcel_size = tonumber(minetest.settings:get("parcel_size")) or 16
factions_config.protection_depth_height_limit = minetest.settings:get_bool("protection_depth_height_limit") or true
factions_config.enable_power_per_player = minetest.settings:get_bool("power_per_playerb") or true
factions_config.attack_parcel = minetest.settings:get_bool("attack_parcel") or false
factions_config.faction_diplomacy = minetest.settings:get_bool("faction_diplomacy") or true
factions_config.protection_style = minetest.settings:get("protection_style") or "2d"
--[[
factions_config.protection_max_depth = -512
factions_config.protection_max_height = 10000
factions_config.power_per_parcel = 1
factions_config.power_per_death = 1
factions_config.power_per_tick = 2
factions_config.tick_time = 60
factions_config.power_per_attack = 10
factions_config.faction_name_max_length = 50
factions_config.rank_name_max_length = 25
factions_config.maximum_faction_inactivity = 604800
factions_config.maximum_parcelless_faction_time = 10800
factions_config.power = 0
factions_config.maxpower = 0
factions_config.power_per_player = 1
factions_config.powermax_per_player = 12
factions_config.parcel_size = 16
factions_config.protection_depth_height_limit = true
factions_config.enable_power_per_player = true
factions_config.attack_parcel = false
factions_config.faction_diplomacy = true
factions_config.protection_style = "2d"
--]]

View File

@ -1,2 +1 @@
default?
bones?
default

File diff suppressed because it is too large Load Diff

90
mods/factions/hud.lua Normal file
View File

@ -0,0 +1,90 @@
hud_ids = {}
function createHudfactionLand(player)
local name = player:get_player_name()
hud_ids[name .. "factionLand"] = player:hud_add({
hud_elem_type = "text",
name = "factionLand",
number = 0xFFFFFF,
position = {x=0.1, y = .98},
text = "Wilderness",
scale = {x=1, y=1},
alignment = {x=0, y=0},
})
end
function createHudFactionName(player,factionname)
local name = player:get_player_name()
local id_name = name .. "factionName"
if not hud_ids[id_name] then
hud_ids[id_name] = player:hud_add({
hud_elem_type = "text",
name = "factionName",
number = 0xFFFFFF,
position = {x=1, y = 0},
text = "Faction "..factionname,
scale = {x=1, y=1},
alignment = {x=-1, y=0},
offset = {x = -20, y = 20}
})
end
end
function createHudPower(player,faction)
local name = player:get_player_name()
local id_name = name .. "powerWatch"
if not hud_ids[id_name] then
hud_ids[id_name] = player:hud_add({
hud_elem_type = "text",
name = "powerWatch",
number = 0xFFFFFF,
position = {x=0.9, y = .98},
text = "Power "..faction.power.."/".. faction.usedpower .."/"..faction.maxpower,
scale = {x=1, y=1},
alignment = {x=-1, y=0},
offset = {x = 0, y = 0}
})
end
end
function updateHudPower(player,faction)
local name = player:get_player_name()
local id_name = name .. "powerWatch"
if hud_ids[id_name] then
player:hud_change(hud_ids[id_name],"text","Power "..faction.power.."/".. faction.usedpower .."/"..faction.maxpower)
end
end
function removeHud(player,hudname)
local name = ""
local p = {}
if type(player) ~= "string" then
name = player:get_player_name()
p = player
else
name = player
p = minetest.get_player_by_name(player)
end
local id_name = name .. hudname
if hud_ids[id_name] then
p:hud_remove(hud_ids[id_name])
hud_ids[id_name] = nil
end
end
function hudUpdateClaimInfo()
minetest.after(3,
function()
local playerslist = minetest.get_connected_players()
for i in pairs(playerslist) do
local player = playerslist[i]
local name = player:get_player_name()
local faction = factions.get_faction_at(player:getpos())
local id_name = name .. "factionLand"
if hud_ids[id_name] then
player:hud_change(hud_ids[id_name],"text",(faction and faction.name) or "Wilderness")
end
end
hudUpdateClaimInfo()
end)
end

View File

@ -1,17 +1,3 @@
-------------------------------------------------------------------------------
-- factions Mod by Sapier
--
-- License WTFPL
--
--! @file init.lua
--! @brief factions mod to be used by other mods
--! @copyright Sapier, Coder12a
--! @author Sapier, Coder12a
--! @date 2013-05-08
--!
-- Contact sapier a t gmx net
-------------------------------------------------------------------------------
factions_version = "0.8.1"
core.log("action", "MOD: factions (by sapier) loading ...")
@ -20,7 +6,8 @@ core.log("action", "MOD: factions (by sapier) loading ...")
factions_modpath = minetest.get_modpath("factions")
dofile (factions_modpath .. "/config.lua")
dofile (factions_modpath .. "/banner.lua")
dofile (factions_modpath .. "/hud.lua")
dofile (factions_modpath .. "/ip.lua")
dofile (factions_modpath .. "/factions.lua")
dofile (factions_modpath .. "/chatcommands.lua")
dofile (factions_modpath .. "/nodes.lua")

28
mods/factions/ip.lua Normal file
View File

@ -0,0 +1,28 @@
factions_ip = {}
factions_ip.player_ips = {}
--read some basic information
local factions_worldid = minetest.get_worldpath()
function factions_ip.save()
local file,error = io.open(factions_worldid .. "/" .. "factions_iplist.txt","w")
if file ~= nil then
file:write(minetest.serialize(factions_ip.player_ips))
file:close()
else
minetest.log("error","MOD factions: unable to save faction player ips!: " .. error)
end
end
function factions_ip.load()
local file,error = io.open(factions_worldid .. "/" .. "factions_iplist.txt","r")
if file ~= nil then
local raw_data = file:read("*a")
factions_ip.player_ips = minetest.deserialize(raw_data)
file:close()
else
minetest.log("error","MOD factions: unable to load faction player ips!: " .. error)
end
end

View File

@ -21,9 +21,9 @@ function factions.can_use_chest(pos, player)
if not parcel_faction then
return true
end
return player_faction and (parcel_faction.name == player_faction.name)
return player_faction and (parcel_faction.name == player_faction.name or parcel_faction.allies[player_faction.name])
end
--[[
minetest.register_node("factions:chest", {
tiles = {"factions_chest_top.png", "factions_chest_top.png",
"factions_chest_side.png", "factions_chest_side.png",
@ -68,4 +68,56 @@ minetest.register_craft({
type = "shapeless",
recipe = {"default:chest_locked", "default:steel_ingot"}
})
--]]
-- Code below was copied from TenPlus1's protector mod(MIT) and changed up a bit.
local x = math.floor(factions_config.parcel_size / 2.1)
minetest.register_node("factions:display_node", {
tiles = {"factions_display.png"},
use_texture_alpha = true,
walkable = false,
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = {
-- sides
{-(x+.55), -(x+.55), -(x+.55), -(x+.45), (x+.55), (x+.55)},
{-(x+.55), -(x+.55), (x+.45), (x+.55), (x+.55), (x+.55)},
{(x+.45), -(x+.55), -(x+.55), (x+.55), (x+.55), (x+.55)},
{-(x+.55), -(x+.55), -(x+.55), (x+.55), (x+.55), -(x+.45)},
-- top
{-(x+.55), (x+.45), -(x+.55), (x+.55), (x+.55), (x+.55)},
-- bottom
{-(x+.55), -(x+.55), -(x+.55), (x+.55), -(x+.45), (x+.55)},
-- middle (surround parcel)
{-.55,-.55,-.55, .55,.55,.55},
},
},
selection_box = {
type = "regular",
},
paramtype = "light",
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "",
})
minetest.register_entity("factions:display", {
physical = false,
collisionbox = {0, 0, 0, 0, 0, 0},
visual = "wielditem",
visual_size = {x = 1.0 / 1.5, y = 1.0 / 1.5},
textures = {"factions:display_node"},
timer = 0,
on_step = function(self, dtime)
self.timer = self.timer + dtime
if self.timer > 6 then
self.object:remove()
end
end,
})
-- End

View File

@ -1,14 +1,16 @@
[ValueSettings]
# The max depth of protection from a parcel.
protection_max_depth (Protection max depth) float -50
protection_max_depth (Protection max depth) float 512
# The max height of protection from a parcel.
protection_max_height (Protection max height) float 10000
# Cost of power to claim a parcel of land.
power_per_parcel (Power-per-parcel) float 0.5
power_per_parcel (Power-per-parcel) float 1
# Power lost on death.
power_per_death (Power-per-death) float 0.25
power_per_death (Power-per-death) float 1
# Power regeneration rate.
power_per_tick (Power-per-tick) float 0.125
# Faction timer. This timer regenerates power if the faction members are online.
power_per_tick (Power-per-tick) float 2
# Faction timer. This timer regenerates power.
tick_time (Faction timer) float 60
# Not in use.
power_per_attack (Power-per-attack) float 10
@ -18,14 +20,32 @@ faction_name_max_length (Faction name max) int 50
rank_name_max_length (Rank name max length) int 25
# The maximum amount of inactivity before disbanning a faction.
maximum_faction_inactivity (Maximum faction inactivity) int 604800
# The maximum amount of time for a parcelless faction to disban.
maximum_parcelless_faction_time (Maximum parcelless faction time) int 10800
# Power of a starting faction (needed for parcel claiming).
power (Starting power) float 2
# Maximum power of a faction.
maxpower (Maximum power) float 2
# How much power the banners make.
power_per_banner (power-per-banner) float 10
power (Starting power) float 0
# Maximum power of a starting faction.
maxpower (Starting Maximum power) float 0
# How much power the players make.
power_per_player (power-per-player) float 1
# How much max power is created per new player.
powermax_per_player (powermax-per-player) float 12
# parcel size
parcel_size (parcel-size) float 16
[BoolSettings]
# Enable or disabled attack_parcel function.
attack_parcel (Enable attack parcel) bool false
# Enable or disabled power-per-player.
power_per_playerb (Enable power-per-player) bool true
# Enable or disabled factions_config.attack_parcel function.
factions_config.attack_parcel (Enable attack parcel) bool false
# Enable or disabled faction diplomacy.
faction_diplomacy (Enable faction diplomacy) bool true
# Enable or disabled the max depth and height limit for a parcel
protection_depth_height_limit (Enable protection depth height limit) bool true
[StringSettings]
# Set the way that the parcel protection works (2d,3d).
# 2d limits how far x and z can go but protection on the y goes up and down far.
# 3d limits all three axis.
protection_style (Protection style) string 2d

Binary file not shown.

Before

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

View File

@ -0,0 +1,2 @@
following Textures created by Coder12a (CC BY-SA 3.0):
factions_display.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 729 B