diff --git a/plugins/lua/onReport.lua b/library/lua/onReport.lua similarity index 95% rename from plugins/lua/onReport.lua rename to library/lua/onReport.lua index 713c32388..edef7574b 100644 --- a/plugins/lua/onReport.lua +++ b/library/lua/onReport.lua @@ -3,14 +3,14 @@ --contains the "ON_REPORT" event: triggered when there is a new report in df.global.world.status.reports --example ---local onReport = require 'plugins.onReport' +--local onReport = require 'onReport' --onReport.triggers.someName = function (reportId) -- --do stuff with that id --end local _ENV = mkmodule('onReport') local utils = require 'utils' -local repeatUtil = require 'plugins.repeatUtil' +local repeatUtil = require 'repeatUtil' lastReport = lastReport or -1 triggers = triggers or {} diff --git a/plugins/lua/onStrike.lua b/library/lua/onStrike.lua similarity index 99% rename from plugins/lua/onStrike.lua rename to library/lua/onStrike.lua index 33f9dffed..58cdfe7cb 100644 --- a/plugins/lua/onStrike.lua +++ b/library/lua/onStrike.lua @@ -1,7 +1,7 @@ local _ENV = mkmodule('onStrike') -local onReport = require 'plugins.onReport' +local onReport = require 'onReport' local utils = require 'utils' debug = debug or true diff --git a/plugins/lua/repeatUtil.lua b/library/lua/repeatUtil.lua similarity index 100% rename from plugins/lua/repeatUtil.lua rename to library/lua/repeatUtil.lua diff --git a/plugins/lua/syndromeUtil.lua b/library/lua/syndromeUtil.lua similarity index 100% rename from plugins/lua/syndromeUtil.lua rename to library/lua/syndromeUtil.lua diff --git a/scripts/itemsyndrome.lua b/scripts/itemsyndrome.lua index 49f83488f..48256dcf5 100644 --- a/scripts/itemsyndrome.lua +++ b/scripts/itemsyndrome.lua @@ -4,7 +4,7 @@ -- Checks for inventory changes and applies or removes syndromes that items or their materials have. Use "disable" (minus quotes) to disable and "help" to get help. eventful=eventful or require("plugins.eventful") -syndromeUtil = syndromeUtil or require("plugins.syndromeUtil") +syndromeUtil = syndromeUtil or require("syndromeUtil") local function printItemSyndromeHelp() print("Arguments (non case-sensitive):") diff --git a/scripts/onReportExample.lua b/scripts/onReportExample.lua index 5e25d4211..4459865fe 100644 --- a/scripts/onReportExample.lua +++ b/scripts/onReportExample.lua @@ -1,6 +1,5 @@ -local onReport = require 'plugins.onReport' -reload('plugins.onReport') +local onReport = require 'onReport' onReport.triggers.onReportExample = function(reportId) -- print('report '..reportId..' happened!') diff --git a/scripts/onStrikeExample.lua b/scripts/onStrikeExample.lua index 36d194f39..4bc85e182 100644 --- a/scripts/onStrikeExample.lua +++ b/scripts/onStrikeExample.lua @@ -1,5 +1,5 @@ -local onStrike = require 'plugins.onStrike' +local onStrike = require 'onStrike' local eventful = require 'plugins.eventful' --print(onStrike)