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

Merge pull request #29 from aegroto/master

Browse Source 
added die-on-spawn while on enemy parcels and added more checks on si…
This commit is contained in:
Elkien3 2018-11-18 16:54:31 -06:00 committed by GitHub
commit 18343b8fab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/factions/config.lua
View File

@ -26,4 +26,4 @@ config.power = tonumber(minetest.setting_get("power")) or 1
config.maxpower = tonumber(minetest.setting_get("maxpower")) or 4 config.maxpower = tonumber(minetest.setting_get("maxpower")) or 4
config.power_per_banner = minetest.settings:get("power_per_banner") or 1 config.power_per_banner = minetest.settings:get("power_per_banner") or 1
config.attack_parcel = minetest.settings:get_bool("attack_parcel") or false config.attack_parcel = minetest.settings:get_bool("attack_parcel") or false
config.siege_banner_interval = minetest.settings:get_bool("siege_banner_interval") or 300 config.siege_banner_interval = minetest.settings:get_bool("siege_banner_interval") or 300

15
mods/factions/factions.lua
View File

@ -974,11 +974,26 @@ function(player)
alignment = {x=0, y=0}, alignment = {x=0, y=0},
}) })
local faction = factions.get_player_faction(name) local faction = factions.get_player_faction(name)
if faction then if faction then
faction.last_logon = os.time() faction.last_logon = os.time()
createHudFactionName(player,faction.name) createHudFactionName(player,faction.name)
createHudPower(player,faction) createHudPower(player,faction)
end end
local pos = player:get_pos()
local parcel_faction = factions.get_faction_at(pos)
if parcel_faction then
if not faction or parcel_faction.name ~= faction.name then
minetest.after(1, function()
if player then
player:set_hp(0)
end
end)
end
end
end end
) )

19
mods/factions/siege.lua
View File

@ -127,6 +127,8 @@ for j = 1, siege_banner_stages - 1 do
minetest.set_node(pos, { name = "factions:siege_banner_" .. j + 1 }) minetest.set_node(pos, { name = "factions:siege_banner_" .. j + 1 })
minetest.get_meta(pos):set_string("infotext", "Siege Banner " .. j + 1 .. "/" .. siege_banner_stages .. " (" .. att_fac_name .. " vs " .. def_fac_name .. ")") minetest.get_meta(pos):set_string("infotext", "Siege Banner " .. j + 1 .. "/" .. 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 (" .. j + 1 .. "/" .. siege_banner_stages .. ")")
meta:set_string("attacking_faction", att_fac_name) meta:set_string("attacking_faction", att_fac_name)
meta:set_string("defending_faction", def_fac_name) meta:set_string("defending_faction", def_fac_name)
end end
@ -150,13 +152,18 @@ minetest.register_abm({
local parcelpos = factions.get_parcel_pos(pos) local parcelpos = factions.get_parcel_pos(pos)
defending_faction:bulk_unclaim_parcel(parcelpos) if defending_faction then
defending_faction:decrease_usedpower(factions.power_per_parcel) defending_faction:bulk_unclaim_parcel(parcelpos)
attacking_faction:bulk_claim_parcel(parcelpos)
attacking_faction:increase_usedpower(factions.power_per_parcel) defending_faction:broadcast(att_fac_name .. " has successfully conquered your parcel at " .. format_pos(pos))
end
if attacking_faction then
attacking_faction:bulk_claim_parcel(parcelpos)
attacking_faction:broadcast("Successfully conquered parcel at " .. format_pos(pos) .. " !")
end
defending_faction:broadcast(att_fac_name .. " has successfully conquered your parcel at " .. format_pos(pos))
attacking_faction:broadcast("Successfully conquered parcel at " .. format_pos(pos) .. " !")
minetest.set_node(pos, { name = "bones:bones" }) minetest.set_node(pos, { name = "bones:bones" })
end end