mff/factions
1
0
Fork 0
forked from mtcontrib/factions
Code Issues Pull Requests Releases Wiki Activity

Fixed a shitton of bugs + added command "where" to check chunk ownership

Browse Source
This commit is contained in:
shamoanjac
2016-08-08 01:10:47 +02:00
parent a52fe6a6bf
commit 55fe191cfd
3 changed files with 147 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
factions.lua
View File

@ -28,13 +28,13 @@ factions.print = function(text)
print("factions: " .. dump(text))
end
factions.dbg_lvl1 = function() end --factionsmod.print -- errors
factions.dbg_lvl2 = function() end --factionsmod.print -- non cyclic trace
factions.dbg_lvl3 = function() end --factionsmod.print -- cyclic trace
factions.dbg_lvl1 = function() end --factions.print -- errors
factions.dbg_lvl2 = function() end --factions.print -- non cyclic trace
factions.dbg_lvl3 = function() end --factions.print -- cyclic trace
factions.factions = {}
--- settings
factions.lower_claimable_height = -512
factions.lower_laimable_height = -512
---------------------
--! @brief returns whether a faction can be created or not (allows for implementation of blacklists and the like)
@ -71,62 +71,81 @@ factions.new_faction = function(name)
-- methods
increase_power = function(self, power)
self.power = self.power + power
factions.save()
end,
decrease_power = function(self, power)
self.power = self.power - power
factions.save()
end,
add_player = function(self, player, rank)
self.players[player] = rank or self.default_rank
factions.players[player] = self.name
self:on_player_join(player)
self.invited_players[player] = nil
factions.save()
end,
remove_player = function(self, player)
self.players[player] = nil
factions.players[player] = nil
self:on_player_leave(player)
factions.save()
end,
claim_chunk = function(self, chunkpos)
factions.chunks[chunkpos] = self.name
self.land[chunkpos] = true
self:on_claim_chunk(chunkpos)
factions.save()
end,
unclaim_chunk = function(self, chunkpos)
factions.chunks[chunkpos] = nil
self.land[chunkpos] = nil
self:on_unclaim_chunks(chunkpos)
factions.save()
end,
disband = function(self)
factions.factions[self.name] = nil
for i in ipairs(self.players) do -- remove players affiliation
factions.players[self.players[i]] = nil
end
for k, v in self.land do -- remove chunk claims
for k, v in pairs(self.land) do -- remove chunk claims
factions.chunks[v] = nil
end
self:on_disband()
factions.factions[self.name] = nil
factions.save()
end,
set_leader = function(self, player)
self.leader = player
self.players[player] = self.default_leader_rank
self:on_new_leader()
factions.save()
end,
has_permission = function(self, player, permission)
local p = self.players[player]
if not p then
return false
end
return table.contains(self.groups[p], permission)
local perms = self.ranks[p]
for i in ipairs(perms) do
if perms[i] == permission then
return true
end
end
return false
end,
set_description = function(self, new)
self.description = new
self:on_change_description()
factions.save()
end,
invite_player = function(self, player)
self.invited_players[player] = true
self:on_player_invited(player)
factions.save()
end,
revoke_invite = function(self, player)
self.invited_player[player] = nil
self.invited_players[player] = nil
self:on_revoke_invite(player)
factions.save()
end,
is_invited = function(self, player)
return table.contains(self.invited_players, player)
@ -134,9 +153,10 @@ factions.new_faction = function(name)
toggle_join_free = function(self, bool)
self.join_free = bool
self:on_toggle_join_free()
factions.save()
end,
can_join = function(self, player)
return self.join_free or invited_players[player]
return self.join_free or self.invited_players[player]
end,
new_alliance = function(self, faction)
self.allies[faction] = true
@ -144,10 +164,12 @@ factions.new_faction = function(name)
if self.enemies[faction] then
self:end_enemy(faction)
end
factions.save()
end,
end_alliance = function(self, faction)
self.allies[faction] = nil
self:on_end_alliance(faction)
factions.save()
end,
new_enemy = function(self, faction)
self.enemies[faction] = true
@ -155,18 +177,22 @@ factions.new_faction = function(name)
if self.allies[faction] then
self:end_alliance(faction)
end
factions.save()
end,
end_enemy = function(self, faction)
self.enemies[faction] = nil
self:on_end_enemy(faction)
factions.save()
end,
set_spawn = function(self, pos)
self.spawn = pos
self:on_set_spawn()
factions.save()
end,
add_rank = function(self, rank, perms)
self.ranks[rank] = perms
self:on_new_rank(rank)
factions.save()
end,
delete_rank = function(self, rank, newrank)
for player, r in pairs(self.players) do
@ -176,10 +202,11 @@ factions.new_faction = function(name)
end
self.ranks[rank] = nil
self:on_delete_rank(rank, newrank)
factions.save()
end,
-----------------------
-- callbacks for events
--------------------------
-- callbacks for events --
on_create = function(self) --! @brief called when the faction is added to the global faction list
--TODO: implement
end,
@ -227,21 +254,22 @@ factions.new_faction = function(name)
end,
}
factions.factions[name] = faction
factions.save()
return faction
end
--??????????????
function factions.fix_powercap(name)
factions.data.factionsmod[name].powercap = #factionsmod.dynamic_data.membertable[name] + 10
factions.data.factions[name].powercap = #factions.dynamic_data.membertable[name] + 10
end
--??????????????
function factions.get_chunk(pos)
return factions.chunks[factionsmod.get_chunkpos(pos)]
return factions.chunks[factions.get_chunkpos(pos)]
end
function factions.get_chunkpos(pos)
return {math.floor(pos.x / 16.), math.floor(pos.z / 16.)}
function factions.get_chunk_pos(pos)
return math.floor(pos.x / 16.)..","..math.floor(pos.z / 16.)
end
@ -300,13 +328,13 @@ function factions.save()
--all data is saved here
--this implies data needs to be cleant up on load
local file,error = io.open(factions_worldid .. "/" .. "factionsmod.conf","w")
local file,error = io.open(factions_worldid .. "/" .. "factions.conf","w")
if file ~= nil then
file:write(minetest.serialize(factions.factions))
file:close()
else
minetest.log("error","MOD factions: unable to save factionsmod world specific data!: " .. error)
minetest.log("error","MOD factions: unable to save factions world specific data!: " .. error)
end
end
@ -321,24 +349,25 @@ end
--! @return true/false
-------------------------------------------------------------------------------
function factions.load()
local file,error = io.open(factions_worldid .. "/" .. "factionsmod.conf","r")
local file,error = io.open(factions_worldid .. "/" .. "factions.conf","r")
if file ~= nil then
local raw_data = file:read("*a")
factions.factions = minetest.deserialize(raw_data)
for facname, faction in pairs(factions.factions) do
for i in ipairs(faction.players) do
factions.players[faction.players[i]] = facname
minetest.log("action", facname..","..faction.name)
for player, rank in pairs(faction.players) do
minetest.log("action", player..","..rank)
factions.players[player] = facname
end
for chunkpos, val in pairs(faction.land) do
factions.chunks[chunkpos] = val
factions.chunks[chunkpos] = facname
end
end
file:close()
end
end
--autojoin players to faction players
minetest.register_on_dieplayer(
function(player)
end
@ -353,3 +382,16 @@ minetest.register_on_joinplayer(
end
)
local default_is_protected = minetest.is_protected
minetest.is_protected = function(pos, player)
local chunkpos = factions.get_chunk_pos(pos)
local faction = factions.chunks[chunkpos]
if not faction then
return default_is_protected(pos, player)
else
faction = factions.factions[faction]
return not faction:has_permission(player, "build")
end
end