From aaaa16a7c598a2f63f5b8c72501e3f37b87c1e63 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 10 May 2015 15:17:26 -0700 Subject: [PATCH] juggle some files around --- Lua/addrs/{M EU10.lua => M/EU10.lua} | 0 Lua/addrs/{M EU11.lua => M/EU11.lua} | 0 Lua/addrs/{M EUDB.lua => M/EUDB.lua} | 0 Lua/addrs/{M EUGC.lua => M/EUGC.lua} | 0 Lua/addrs/{M JP10.lua => M/JP10.lua} | 0 Lua/addrs/{M JP11.lua => M/JP11.lua} | 0 Lua/addrs/{M JPGC.lua => M/JPGC.lua} | 0 Lua/addrs/{M US10.lua => M/US10.lua} | 0 Lua/addrs/{M USDE.lua => M/USDE.lua} | 0 Lua/addrs/{M USGC.lua => M/USGC.lua} | 0 Lua/addrs/{M common.lua => M/common.lua} | 0 Lua/addrs/{O EU10.lua => O/EU10.lua} | 0 Lua/addrs/{O EU11.lua => O/EU11.lua} | 0 Lua/addrs/{O EUDB MQ.lua => O/EUDB MQ.lua} | 0 Lua/addrs/{O EUGC MQ.lua => O/EUGC MQ.lua} | 0 Lua/addrs/{O EUGC.lua => O/EUGC.lua} | 0 Lua/addrs/{O JP10.lua => O/JP10.lua} | 0 Lua/addrs/{O JP11.lua => O/JP11.lua} | 0 Lua/addrs/{O JP12.lua => O/JP12.lua} | 0 Lua/addrs/{O JPGC MQ.lua => O/JPGC MQ.lua} | 0 Lua/addrs/{O JPGC.lua => O/JPGC.lua} | 0 Lua/addrs/{O US10.lua => O/US10.lua} | 0 Lua/addrs/{O US11.lua => O/US11.lua} | 0 Lua/addrs/{O US12.lua => O/US12.lua} | 0 Lua/addrs/{O USGC MQ.lua => O/USGC MQ.lua} | 0 Lua/addrs/{O USGC.lua => O/USGC.lua} | 0 Lua/addrs/{O common.lua => O/common.lua} | 0 Lua/addrs/addrs.lua | 7 +++++-- 28 files changed, 5 insertions(+), 2 deletions(-) rename Lua/addrs/{M EU10.lua => M/EU10.lua} (100%) rename Lua/addrs/{M EU11.lua => M/EU11.lua} (100%) rename Lua/addrs/{M EUDB.lua => M/EUDB.lua} (100%) rename Lua/addrs/{M EUGC.lua => M/EUGC.lua} (100%) rename Lua/addrs/{M JP10.lua => M/JP10.lua} (100%) rename Lua/addrs/{M JP11.lua => M/JP11.lua} (100%) rename Lua/addrs/{M JPGC.lua => M/JPGC.lua} (100%) rename Lua/addrs/{M US10.lua => M/US10.lua} (100%) rename Lua/addrs/{M USDE.lua => M/USDE.lua} (100%) rename Lua/addrs/{M USGC.lua => M/USGC.lua} (100%) rename Lua/addrs/{M common.lua => M/common.lua} (100%) rename Lua/addrs/{O EU10.lua => O/EU10.lua} (100%) rename Lua/addrs/{O EU11.lua => O/EU11.lua} (100%) rename Lua/addrs/{O EUDB MQ.lua => O/EUDB MQ.lua} (100%) rename Lua/addrs/{O EUGC MQ.lua => O/EUGC MQ.lua} (100%) rename Lua/addrs/{O EUGC.lua => O/EUGC.lua} (100%) rename Lua/addrs/{O JP10.lua => O/JP10.lua} (100%) rename Lua/addrs/{O JP11.lua => O/JP11.lua} (100%) rename Lua/addrs/{O JP12.lua => O/JP12.lua} (100%) rename Lua/addrs/{O JPGC MQ.lua => O/JPGC MQ.lua} (100%) rename Lua/addrs/{O JPGC.lua => O/JPGC.lua} (100%) rename Lua/addrs/{O US10.lua => O/US10.lua} (100%) rename Lua/addrs/{O US11.lua => O/US11.lua} (100%) rename Lua/addrs/{O US12.lua => O/US12.lua} (100%) rename Lua/addrs/{O USGC MQ.lua => O/USGC MQ.lua} (100%) rename Lua/addrs/{O USGC.lua => O/USGC.lua} (100%) rename Lua/addrs/{O common.lua => O/common.lua} (100%) diff --git a/Lua/addrs/M EU10.lua b/Lua/addrs/M/EU10.lua similarity index 100% rename from Lua/addrs/M EU10.lua rename to Lua/addrs/M/EU10.lua diff --git a/Lua/addrs/M EU11.lua b/Lua/addrs/M/EU11.lua similarity index 100% rename from Lua/addrs/M EU11.lua rename to Lua/addrs/M/EU11.lua diff --git a/Lua/addrs/M EUDB.lua b/Lua/addrs/M/EUDB.lua similarity index 100% rename from Lua/addrs/M EUDB.lua rename to Lua/addrs/M/EUDB.lua diff --git a/Lua/addrs/M EUGC.lua b/Lua/addrs/M/EUGC.lua similarity index 100% rename from Lua/addrs/M EUGC.lua rename to Lua/addrs/M/EUGC.lua diff --git a/Lua/addrs/M JP10.lua b/Lua/addrs/M/JP10.lua similarity index 100% rename from Lua/addrs/M JP10.lua rename to Lua/addrs/M/JP10.lua diff --git a/Lua/addrs/M JP11.lua b/Lua/addrs/M/JP11.lua similarity index 100% rename from Lua/addrs/M JP11.lua rename to Lua/addrs/M/JP11.lua diff --git a/Lua/addrs/M JPGC.lua b/Lua/addrs/M/JPGC.lua similarity index 100% rename from Lua/addrs/M JPGC.lua rename to Lua/addrs/M/JPGC.lua diff --git a/Lua/addrs/M US10.lua b/Lua/addrs/M/US10.lua similarity index 100% rename from Lua/addrs/M US10.lua rename to Lua/addrs/M/US10.lua diff --git a/Lua/addrs/M USDE.lua b/Lua/addrs/M/USDE.lua similarity index 100% rename from Lua/addrs/M USDE.lua rename to Lua/addrs/M/USDE.lua diff --git a/Lua/addrs/M USGC.lua b/Lua/addrs/M/USGC.lua similarity index 100% rename from Lua/addrs/M USGC.lua rename to Lua/addrs/M/USGC.lua diff --git a/Lua/addrs/M common.lua b/Lua/addrs/M/common.lua similarity index 100% rename from Lua/addrs/M common.lua rename to Lua/addrs/M/common.lua diff --git a/Lua/addrs/O EU10.lua b/Lua/addrs/O/EU10.lua similarity index 100% rename from Lua/addrs/O EU10.lua rename to Lua/addrs/O/EU10.lua diff --git a/Lua/addrs/O EU11.lua b/Lua/addrs/O/EU11.lua similarity index 100% rename from Lua/addrs/O EU11.lua rename to Lua/addrs/O/EU11.lua diff --git a/Lua/addrs/O EUDB MQ.lua b/Lua/addrs/O/EUDB MQ.lua similarity index 100% rename from Lua/addrs/O EUDB MQ.lua rename to Lua/addrs/O/EUDB MQ.lua diff --git a/Lua/addrs/O EUGC MQ.lua b/Lua/addrs/O/EUGC MQ.lua similarity index 100% rename from Lua/addrs/O EUGC MQ.lua rename to Lua/addrs/O/EUGC MQ.lua diff --git a/Lua/addrs/O EUGC.lua b/Lua/addrs/O/EUGC.lua similarity index 100% rename from Lua/addrs/O EUGC.lua rename to Lua/addrs/O/EUGC.lua diff --git a/Lua/addrs/O JP10.lua b/Lua/addrs/O/JP10.lua similarity index 100% rename from Lua/addrs/O JP10.lua rename to Lua/addrs/O/JP10.lua diff --git a/Lua/addrs/O JP11.lua b/Lua/addrs/O/JP11.lua similarity index 100% rename from Lua/addrs/O JP11.lua rename to Lua/addrs/O/JP11.lua diff --git a/Lua/addrs/O JP12.lua b/Lua/addrs/O/JP12.lua similarity index 100% rename from Lua/addrs/O JP12.lua rename to Lua/addrs/O/JP12.lua diff --git a/Lua/addrs/O JPGC MQ.lua b/Lua/addrs/O/JPGC MQ.lua similarity index 100% rename from Lua/addrs/O JPGC MQ.lua rename to Lua/addrs/O/JPGC MQ.lua diff --git a/Lua/addrs/O JPGC.lua b/Lua/addrs/O/JPGC.lua similarity index 100% rename from Lua/addrs/O JPGC.lua rename to Lua/addrs/O/JPGC.lua diff --git a/Lua/addrs/O US10.lua b/Lua/addrs/O/US10.lua similarity index 100% rename from Lua/addrs/O US10.lua rename to Lua/addrs/O/US10.lua diff --git a/Lua/addrs/O US11.lua b/Lua/addrs/O/US11.lua similarity index 100% rename from Lua/addrs/O US11.lua rename to Lua/addrs/O/US11.lua diff --git a/Lua/addrs/O US12.lua b/Lua/addrs/O/US12.lua similarity index 100% rename from Lua/addrs/O US12.lua rename to Lua/addrs/O/US12.lua diff --git a/Lua/addrs/O USGC MQ.lua b/Lua/addrs/O/USGC MQ.lua similarity index 100% rename from Lua/addrs/O USGC MQ.lua rename to Lua/addrs/O/USGC MQ.lua diff --git a/Lua/addrs/O USGC.lua b/Lua/addrs/O/USGC.lua similarity index 100% rename from Lua/addrs/O USGC.lua rename to Lua/addrs/O/USGC.lua diff --git a/Lua/addrs/O common.lua b/Lua/addrs/O/common.lua similarity index 100% rename from Lua/addrs/O common.lua rename to Lua/addrs/O/common.lua diff --git a/Lua/addrs/addrs.lua b/Lua/addrs/addrs.lua index 6e3429c..ba41f97 100755 --- a/Lua/addrs/addrs.lua +++ b/Lua/addrs/addrs.lua @@ -29,10 +29,13 @@ return function(hash) end function AA(a, s) return A(b.actor + a, s) end - local addrs = require("addrs."..rv) + local subdir = version:sub(1, 1) + local rvs = rv:sub(3) + + local addrs = require("addrs."..subdir.."."..rvs) addrs.version = version addrs.oot = v == "O " addrs.mm = v == "M " - local common = require("addrs."..v.."common") + local common = require("addrs."..subdir..".common") return setmetatable(addrs, {__index=common}) end