refactoring

core/cache.lua

@@ -1,4 +1,4 @@
-aux 'cache' import 'info'
+aux 'cache' local info, persistence = aux.info, aux.persistence
 
 MIN_ITEM_ID = 1
 MAX_ITEM_ID = 30000
@@ -16,7 +16,6 @@ _G.aux_merchant_sell = t
 _G.aux_characters = t
 
 function LOAD()
-	import 'persistence' 'info'
 	scan_wdb()
 
 	event_listener('MERCHANT_SHOW', on_merchant_show)

core/disenchant.lua

@@ -39,7 +39,7 @@ do
 end
 
 function LOAD()
-	ARMOR = set(
+	ARMOR = -set(
 		'INVTYPE_HEAD',
 		'INVTYPE_NECK',
 		'INVTYPE_SHOULDER',
@@ -56,7 +56,7 @@ function LOAD()
 		'INVTYPE_CLOAK',
 		'INVTYPE_HOLDABLE'
 	)
-	WEAPON = set(
+	WEAPON = -set(
 		'INVTYPE_2HWEAPON',
 		'INVTYPE_WEAPONMAINHAND',
 		'INVTYPE_WEAPON',

core/history.lua

@@ -1,10 +1,4 @@
-aux 'history' import 'persistence'
-
---local history_schema = tuple('#')
---	:next_push 'number'
---	:daily_min_buyout 'number'
---	:daily_max_price 'number'
---	:data_points (list(';') (tuple('@') :market_value 'number' :time 'number'))
+aux 'history' local persistence = aux.persistence
 
 local history_schema = {'record', '#', {next_push='number'}, {daily_min_buyout='number'}, {daily_max_price='number'}, {data_points={'list', ';', {'record', '@', {market_value='number'}, {time='number'}}}} }
 

core/scan.lua

@@ -1,8 +1,4 @@
-aux 'scan' import 'info'
-
-function LOAD()
-	import 'history'
-end
+aux 'scan' local info, history = aux.info, aux.history
 
 PAGE_SIZE = 50
 

core/slash.lua

@@ -1,4 +1,4 @@
-aux 'slash' import 'persistence'
+aux 'slash' local persistence = aux.persistence
 
 _G.SLASH_AUX1 = '/aux'
 function _G.SlashCmdList.AUX(command)

core/stack.lua

@@ -1,4 +1,4 @@
-aux 'stack' import 'info'
+aux 'stack' local info = aux.info
 
 state = nil
 

core/tooltip.lua

@@ -1,4 +1,4 @@
-aux 'tooltip' import 'info' 'disenchant' 'cache' 'money' 'history'
+aux 'tooltip' local info, disenchant, cache, money, history = aux.info, aux.disenchant, aux.cache, aux.money, aux.history
 
 _G.aux_tooltip_value = true