Elkien3/kingdoms_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35 from Coder12a/master

Browse Source 
Small changes and fixes:
This commit is contained in:
Elkien3 2018-11-22 20:13:32 -06:00 committed by GitHub
commit cb2913742c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/factions/factions.lua
View File

@ -340,7 +340,7 @@ end
function factions.Faction.can_claim_parcel(self, parcelpos)
local fac = factions.parcels[parcelpos]
if fac then
if factions.factions[fac].power < 0. and self.power >= factions.power_per_parcel then
if factions.factions[fac].power < 0. and self.power >= factions.power_per_parcel and self.enemies[fac.name] then
return true
else
return false
@ -1212,7 +1212,7 @@ function(player)
-- 300 seconds = 5 minutes
-- Kill unstamped players.
if parcel_faction and parcel_faction.is_admin == false and (value == 0 or os.time() - value >= 300) then
if (not faction or parcel_faction.name ~= facname) and parcel_faction.enemies[facname] then
if (not faction or parcel_faction.name ~= facname) and (facname == "" or parcel_faction.enemies[facname]) then
minetest.after(1, function()
if player then
player:set_hp(0)

6
mods/factions/siege.lua
View File

@ -93,11 +93,11 @@ minetest.register_craftitem("factions:siege_banner", {
local meta = minetest.get_meta(pointed_thing.above)
meta:set_int("stage",0)
meta:set_int("stage",1)
meta:set_string("attacking_faction", attacking_faction.name)
meta:set_string("defending_faction", defending_faction.name)
minetest.get_meta(pointed_thing.above):set_string("infotext", "Siege Banner 1/4 (" .. attacking_faction.name .. " vs " .. defending_faction.name .. ")")
meta:set_string("infotext", "Siege Banner 1/4 (" .. attacking_faction.name .. " vs " .. defending_faction.name .. ")")
return ""
end
@ -125,7 +125,7 @@ minetest.register_node("factions:siege_banner_sieging", {
stage = stage + 1
if stage <= siege_banner_stages then
minetest.get_meta(pos):set_string("infotext", "Siege Banner " .. stage .. "/" .. siege_banner_stages .. " (" .. att_fac_name .. " vs " .. def_fac_name .. ")")
meta:set_string("infotext", "Siege Banner " .. stage .. "/" .. siege_banner_stages .. " (" .. att_fac_name .. " vs " .. def_fac_name .. ")")
factions.get_faction(def_fac_name):broadcast("Your parcel at " .. format_pos(pos) .. " is being sieged (" .. stage .. "/" .. siege_banner_stages .. ")")
meta:set_int("stage",stage)
meta:set_string("attacking_faction", att_fac_name)