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

Fix: line 978 had a typo

Browse Source 
new factions are neutral with everyone.
This commit is contained in:
Coder12a 2018-12-26 21:26:27 -06:00
parent 73b3fb300d
commit 269690d279
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chatcommands.lua
View File

@ -645,8 +645,8 @@ if factions_config.faction_diplomacy == true then
faction:end_neutral(args.strings[1]) faction:end_neutral(args.strings[1])
factions.factions[args.strings[1]]:end_neutral(faction.name) factions.factions[args.strings[1]]:end_neutral(faction.name)
end end
faction:new_enemy(args.strings[1]) faction:new_neutral(args.strings[1])
factions.factions[args.strings[1]]:new_enemy(faction.name) factions.factions[args.strings[1]]:new_neutral(faction.name)
factions.bulk_save() factions.bulk_save()
else else
send_error(player, "You are already at war.") send_error(player, "You are already at war.")
@ -975,7 +975,7 @@ factions.register_command("set_rank_name", {
faction:set_rank_name(rank, newrank) faction:set_rank_name(rank, newrank)
return true return true
end end
},falsw) },false)
factions.register_command("del_rank", { factions.register_command("del_rank", {
description = "Replace and delete a rank.", description = "Replace and delete a rank.",

4
factions.lua
View File

@ -199,8 +199,8 @@ end
function factions.start_diplomacy(name,faction) function factions.start_diplomacy(name,faction)
for i,fac in pairs(factions.factions) do for i,fac in pairs(factions.factions) do
if i ~= name and not (faction.neutral[i] or faction.allies[i] or faction.enemies[i]) then if i ~= name and not (faction.neutral[i] or faction.allies[i] or faction.enemies[i]) then
faction:new_enemy(i) faction:new_neutral(i)
fac:new_enemy(name) fac:new_neutral(name)
end end
end end
end end