From 8d48f107fc9d3bad5891c6b291017db97b235f2c Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 26 Mar 2014 00:10:50 -0700 Subject: [PATCH] Made mods load in specified order rather than alphabetical. --- hack/mods/fortress defense bonus/init.lua | 1 + hack/mods/fortress defense challenge/init.lua | 3 ++- hack/mods/fortress defense/init.lua | 1 + hack/scripts/gui/mod-manager.lua | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/mods/fortress defense bonus/init.lua b/hack/mods/fortress defense bonus/init.lua index e46a387..ca4142e 100644 --- a/hack/mods/fortress defense bonus/init.lua +++ b/hack/mods/fortress defense bonus/init.lua @@ -1,6 +1,7 @@ local G=_G local _ENV={} +loadnum=3 name="FD Bonus" raws_list={"creature_fdbonus.txt","entity_fdbonus.txt"} diff --git a/hack/mods/fortress defense challenge/init.lua b/hack/mods/fortress defense challenge/init.lua index 2ef466e..8eea226 100644 --- a/hack/mods/fortress defense challenge/init.lua +++ b/hack/mods/fortress defense challenge/init.lua @@ -1,7 +1,8 @@ local G=_G local _ENV={} -name="Fortress Defense Challenge" +loadnum=2 +name="FD Challenge" raws_list={"creature_fdchallenge.txt","entity_fdchallenge.txt"} author="darkflagrance" diff --git a/hack/mods/fortress defense/init.lua b/hack/mods/fortress defense/init.lua index a0e77d6..148105d 100644 --- a/hack/mods/fortress defense/init.lua +++ b/hack/mods/fortress defense/init.lua @@ -1,6 +1,7 @@ local G=_G local _ENV={} +loadnum=1 name="Fortress Defense" raws_list={"body_fdbody.txt","building_fdreactors.txt","creature_fortdefense.txt","entity_fortdefense.txt", "inorganic_stone_vaporstonefd.txt","item_armor_fd.txt","reaction_fdmetals.txt"} diff --git a/hack/scripts/gui/mod-manager.lua b/hack/scripts/gui/mod-manager.lua index 6de0268..2d0fefe 100644 --- a/hack/scripts/gui/mod-manager.lua +++ b/hack/scripts/gui/mod-manager.lua @@ -114,7 +114,7 @@ function manager:init(args) if v~="." and v~=".." then local f,modData=pcall(dofile,dfhack.getHackPath().."/mods/".. v .. "/init.lua") if f then - mods[modData.name]=modData + mods[modData.loadnum]=modData modData.guard=modData.guard or {">>"..modData.name.." patch","<