Linked-from-other-Sources
/
AardDurel-Dinv
mirror of https://github.com/jontsai/aard-plugins.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Version 2.0008

Browse Source 
1) Updated "dinv priority display ..." to show all level blocks at once
2) Refactored priority framework in preparation for a priority GUI
master
Durel 7 years ago
parent 6c9c677d4a
commit b683c76a9f
2 changed files with 443 additions and 289 deletions
Show Stats Download Patch File Download Diff File

12
aard_inventory.changelog
Unescape View File

@ -1,6 +1,16 @@
dbot.changelog = {} dbot.changelog = {}
dbot.changelog[2.0008] =
{
{ change = drlDbotChangeLogTypeNew,
desc = "Updated "dinv priority display ..." to show all level blocks at once"
},
{ change = drlDbotChangeLogTypeMisc,
desc = "Refactored priority framework in preparation for a priority GUI"
}
}
dbot.changelog[2.0007] = dbot.changelog[2.0007] =
{ {
{ change = drlDbotChangeLogTypeMisc, { change = drlDbotChangeLogTypeMisc,
@ -65,7 +75,7 @@ dbot.changelog[2.0002] =
dbot.changelog[2.0001] = dbot.changelog[2.0001] =
{ {
{ change = drlDbotChangeLogTypeFix, { change = drlDbotChangeLogTypeFix,
desc = "Fixed update framework for older r1825 mush builds" desc = "Fixed update framework to support older r1825 mush builds"
}, },
{ change = drlDbotChangeLogTypeFix, { change = drlDbotChangeLogTypeFix,
desc = "Properly handles if someone cancels a quit command" desc = "Properly handles if someone cancels a quit command"

714
aard_inventory.xml
Unescape View File

@ -87,7 +87,7 @@ dbot.version : Module to track version and changelog information and update the
save_state="y" save_state="y"
date_written="2017-08-12 08:45:15" date_written="2017-08-12 08:45:15"
requires="4.98" requires="4.98"
version="2.0007" version="2.0008"
> >
<description trim="y"> <description trim="y">
<![CDATA[ <![CDATA[
@ -2469,169 +2469,37 @@ Examples:
why this plugin gives you the ability to tweak things to your heart's content :) why this plugin gives you the ability to tweak things to your heart's content :)
"@Gdinv priority display psi-melee@W" "@Gdinv priority display psi-melee@W"
@WPriority "@Cpsi-melee@W": Levels @G1@W - @G50 @WPriority: "@Cpsi-melee@W"
@w @y mana @W= @R0.010
@w @y hp @W= @R0.020 @W Field L001- L051- L071- L131- L171- L201-
@w @y allmagic @W= @R0.030 Name L050 L070 L130 L170 L200 L291
@w @y allphys @W= @R0.030 @C
@w @y con @W= @R0.200 @C str@w 1.00 1.00 0.80@y 0.70 0.70 0.50@W : @cValue of 1 point of the strength stat
@w @y offhandDam @W= @R0.330 @C int@w 0.80 1.00 1.00 1.00 1.00 1.00@W : @cValue of 1 point of the intelligence stat
@w @y wis @W= 0.700 @C wis@y 0.70@w 0.80 0.90 1.00 1.00 1.00@W : @cValue of 1 point of the wisdom stat
@w @y dex @W= 0.800 @C dex@w 0.80@y 0.50 0.60 0.50@r 0.40 0.40@W : @cValue of 1 point of the dexterity stat
@w @y int @W= 0.800 @C con@r 0.20 0.20 0.40 0.40 0.40 0.25@W : @cValue of 1 point of the constitution stat
@w @y hit @W= 0.850 @C luck@w 1.00 1.00 1.00 1.00 1.00 1.00@W : @cValue of 1 point of the luck stat
@w @y dam @W= 0.900 @C dam@w 0.90 0.90 0.85 0.85 0.85 0.80@W : @cValue of 1 point of damroll
@w @y luck @W= 1.000 @C hit@w 0.85 0.80@y 0.75@w 0.85 0.85 0.80@W : @cValue of 1 point of hitroll
@w @y avedam @W= 1.000 @C avedam@w 1.00 1.00 1.00 1.00 1.00 1.00@W : @cValue of 1 point of primary weapon ave damage
@w @y str @W= 1.000 @C offhandDam@r 0.33 0.40@y 0.50 0.60 0.70@w 0.85@W : @cValue of 1 point of offhand weapon ave damage
@w @y irongrip @W= @G2.000 @C hp@r 0.02 0.01 0.01 0.01 0.01 0.01@W : @cValue of 1 hit point
@w @y detectevil @W= @G2.000 @C mana@r 0.01 0.01 0.01 0.01 0.01 0.01@W : @cValue of 1 mana point
@w @y detectgood @W= @G2.000 @C sanctuary@G 50.00 10.00 10.00 10.00 20.00 5.00@W : @cValue placed on the sanctuary effect
@w @ydetecthidden @W= @G3.000 @C haste@G 20.00 5.00@g 2.00 2.00 2.00 2.00@W : @cValue placed on the haste effect
@w @y detectinvis @W= @G4.000 @C flying@G 5.00@g 4.00 2.00@w 1.00 1.00 1.00@W : @cValue placed on the flying effect
@w @y flying @W= @G5.000 @C invis@G 10.00 5.00@g 3.00@w 1.00 1.00 1.00@W : @cValue placed on the invisible effect
@w @yregeneration @W= @G5.000 @Cregeneration@G 5.00 5.00 5.00 5.00 5.00@g 2.00@W : @cValue placed on the regeneration effect
@w @y shield @W= @G5.000 @C detectinvis@g 4.00 4.00 2.00 2.00 2.00 2.00@W : @cValue placed on the detect invis effect
@w @y invis @W= @G10.000 @Cdetecthidden@g 3.00 3.00 2.00 2.00 2.00 2.00@W : @cValue placed on the detect hidden effect
@w @y haste @W= @G20.000 @C detectevil@g 2.00 2.00 2.00 2.00 2.00 2.00@W : @cValue placed on the detect evil effect
@w @y dualwield @W= @G20.000 @C detectgood@g 2.00 2.00 2.00 2.00 2.00 2.00@W : @cValue placed on the detect good effect
@w @y sanctuary @W= @G50.000 @C dualwield@G 20.00@R 0.00 0.00 0.00 0.00 0.00@W : @cValue of an item's dual wield effect
@WPriority "@Cpsi-melee@W": Levels @G51@W - @G70 @C irongrip@g 2.00 3.00@G 20.00 20.00 25.00 30.00@W : @cValue of an item's irongrip effect
@w @y hp @W= @R0.010 @C shield@G 5.00 5.00 10.00 20.00 25.00 40.00@W : @cValue of a shield's damage reduction effect
@w @y mana @W= @R0.010 @C allmagic@r 0.03 0.03 0.05 0.05 0.05 0.05@W : @cValue of 1 point in each magical resist type
@w @y allmagic @W= @R0.030 @C allphys@r 0.03 0.05 0.10 0.10 0.10 0.10@W : @cValue of 1 point in each physical resist type
@w @y allphys @W= @R0.050
@w @y con @W= @R0.200
@w @y offhandDam @W= @R0.400
@w @y dex @W= @R0.500
@w @y wis @W= 0.800
@w @y hit @W= 0.800
@w @y dam @W= 0.900
@w @y int @W= 1.000
@w @y luck @W= 1.000
@w @y avedam @W= 1.000
@w @y str @W= 1.000
@w @y detectevil @W= @G2.000
@w @y detectgood @W= @G2.000
@w @ydetecthidden @W= @G3.000
@w @y irongrip @W= @G3.000
@w @y flying @W= @G4.000
@w @y detectinvis @W= @G4.000
@w @y shield @W= @G5.000
@w @y invis @W= @G5.000
@w @y haste @W= @G5.000
@w @yregeneration @W= @G5.000
@w @y sanctuary @W= @G10.000
@WPriority "@Cpsi-melee@W": Levels @G71@W - @G130
@w @y hp @W= @R0.010
@w @y mana @W= @R0.010
@w @y allmagic @W= @R0.050
@w @y allphys @W= @R0.100
@w @y con @W= @R0.400
@w @y offhandDam @W= @R0.500
@w @y dex @W= @R0.600
@w @y hit @W= 0.750
@w @y str @W= 0.800
@w @y dam @W= 0.850
@w @y wis @W= 0.900
@w @y int @W= 1.000
@w @y luck @W= 1.000
@w @y avedam @W= 1.000
@w @y haste @W= @G2.000
@w @y detectinvis @W= @G2.000
@w @y detectgood @W= @G2.000
@w @ydetecthidden @W= @G2.000
@w @y flying @W= @G2.000
@w @y detectevil @W= @G2.000
@w @y invis @W= @G3.000
@w @yregeneration @W= @G5.000
@w @y shield @W= @G10.000
@w @y sanctuary @W= @G10.000
@w @y irongrip @W= @G20.000
@WPriority "@Cpsi-melee@W": Levels @G131@W - @G170
@w @y hp @W= @R0.010
@w @y mana @W= @R0.010
@w @y allmagic @W= @R0.050
@w @y allphys @W= @R0.100
@w @y con @W= @R0.400
@w @y dex @W= @R0.500
@w @y offhandDam @W= @R0.600
@w @y str @W= 0.700
@w @y dam @W= 0.850
@w @y hit @W= 0.850
@w @y flying @W= 1.000
@w @y int @W= 1.000
@w @y luck @W= 1.000
@w @y invis @W= 1.000
@w @y avedam @W= 1.000
@w @y wis @W= 1.000
@w @y detectinvis @W= @G2.000
@w @y detectevil @W= @G2.000
@w @ydetecthidden @W= @G2.000
@w @y haste @W= @G2.000
@w @y detectgood @W= @G2.000
@w @yregeneration @W= @G5.000
@w @y sanctuary @W= @G10.000
@w @y irongrip @W= @G20.000
@w @y shield @W= @G20.000
@WPriority "@Cpsi-melee@W": Levels @G171@W - @G200
@w @y hp @W= @R0.010
@w @y mana @W= @R0.010
@w @y allmagic @W= @R0.050
@w @y allphys @W= @R0.100
@w @y dex @W= @R0.400
@w @y con @W= @R0.400
@w @y offhandDam @W= 0.700
@w @y str @W= 0.700
@w @y dam @W= 0.850
@w @y hit @W= 0.850
@w @y flying @W= 1.000
@w @y wis @W= 1.000
@w @y luck @W= 1.000
@w @y int @W= 1.000
@w @y avedam @W= 1.000
@w @y invis @W= 1.000
@w @ydetecthidden @W= @G2.000
@w @y haste @W= @G2.000
@w @y detectevil @W= @G2.000
@w @y detectinvis @W= @G2.000
@w @y detectgood @W= @G2.000
@w @y maxwis @W= @G5.000
@w @yregeneration @W= @G5.000
@w @y maxluck @W= @G5.000
@w @y maxint @W= @G5.000
@w @y sanctuary @W= @G20.000
@w @y irongrip @W= @G25.000
@w @y shield @W= @G25.000
@WPriority "@Cpsi-melee@W": Levels @G201@W - @G291
@w @y hp @W= @R0.010
@w @y mana @W= @R0.010
@w @y allmagic @W= @R0.050
@w @y allphys @W= @R0.100
@w @y con @W= @R0.250
@w @y dex @W= @R0.400
@w @y str @W= @R0.500
@w @y dam @W= 0.800
@w @y hit @W= 0.800
@w @y offhandDam @W= 0.850
@w @y flying @W= 1.000
@w @y luck @W= 1.000
@w @y invis @W= 1.000
@w @y int @W= 1.000
@w @y wis @W= 1.000
@w @y avedam @W= 1.000
@w @ydetecthidden @W= @G2.000
@w @y detectinvis @W= @G2.000
@w @y detectevil @W= @G2.000
@w @y haste @W= @G2.000
@w @y detectgood @W= @G2.000
@w @yregeneration @W= @G2.000
@w @y sanctuary @W= @G5.000
@w @y maxint @W= @G20.000
@w @y maxwis @W= @G20.000
@w @y maxluck @W= @G20.000
@w @y irongrip @W= @G30.000
@w @y shield @W= @G40.000@@
@W @W
At the present time, the plugin does not have a GUI component so priority customization must be At the present time, the plugin does not have a GUI component so priority customization must be
done by manually editing the plugin file directly. Adding a GUI is very high on the priority list done by manually editing the plugin file directly. Adding a GUI is very high on the priority list
@ -10344,21 +10212,33 @@ end -- inv.cache.clearOld
-- inv.priority.load() -- inv.priority.load()
-- inv.priority.reset() -- inv.priority.reset()
-- --
-- inv.priority.add(priorityName, priorityTable) -- inv.priority.create(priorityName, endTag)
-- inv.priority.remove(priorityName) -- inv.priority.clone(clonedPriorityName, origPriorityName, endTag)
-- inv.priority.get(priorityName, level) -- inv.priority.delete(priorityName, endTag)
-- --
-- inv.priority.display(priorityName, endTag)
-- inv.priority.displayBlock(priorityBlock, priorityName)
-- inv.priority.list(endTag) -- inv.priority.list(endTag)
-- inv.priority.display(priorityName, endTag)
--
-- inv.priority.edit(priorityName, level, endTag)
-- inv.priority.split(priorityName, level, endTag)
-- inv.priority.join(priorityName, level, endTag)
-- --
-- inv.priority.compare(priorityName1, priorityName2, endTag) -- inv.priority.compare(priorityName1, priorityName2, endTag)
-- --
-- inv.priority.new(priorityName)
-- inv.priority.add(priorityName, priorityTable)
-- inv.priority.remove(priorityName)
-- inv.priority.get(priorityName, level)
--
-- inv.priority.tableToString(priorityTable, doDisplayUnused, doDisplayColors, doDisplayDesc)
-- inv.priority.stringToTable(priorityString)
--
-- inv.priority.addDefault() -- add some default priorities -- inv.priority.addDefault() -- add some default priorities
-- --
-- Data: -- Data:
-- inv.priority = {} -- inv.priority = {}
-- inv.priority.table = {} -- inv.priority.table = {}
-- inv.priority.fieldTable = {}
-- --
---------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------
@ -10454,93 +10334,114 @@ function inv.priority.reset()
end -- inv.priority.reset end -- inv.priority.reset
function inv.priority.add(priorityName, priorityTable) function inv.priority.create(priorityName, endTag)
local retval = DRL_RET_SUCCESS
if (priorityName == nil) or (priorityName == "") then if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.add: Missing priorityName parameter") dbot.warn("inv.priority.create: priority name is missing!")
return DRL_RET_INVALID_PARAM return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INVALID_PARAM)
end -- if end -- if
if (priorityTable == nil) then if (inv.priority.table[priorityName] ~= nil) then
dbot.warn("inv.priority.add: priorityTable is nil") dbot.warn("inv.priority.create: Priority \"@C" .. priorityName .. "@W\" already exists")
return DRL_RET_INVALID_PARAM return inv.tags.stop(invTagsPriority, endTag, DRL_RET_BUSY)
end -- if end -- if
inv.priority.table[priorityName] = priorityTable retval = inv.priority.new(priorityName)
local retval = inv.priority.save()
if (retval ~= DRL_RET_SUCCESS) then if (retval ~= DRL_RET_SUCCESS) then
dbot.warn("inv.priority.add: Failed to save priorities: " .. dbot.retval.getString(retval)) dbot.warn("inv.priority.create: Failed to add new priority \"@C" .. priorityName .. "@W\": " ..
dbot.retval.getString(retval))
else
retval = inv.priority.edit(priorityName)
if (retval ~= DRL_RET_SUCCESS) then
dbot.warn("inv.priority.create: Failed to edit priority \"@C" .. priorityName .. "@W\": " ..
dbot.retval.getString(retval))
end -- if
end -- if end -- if
return retval return inv.tags.stop(invTagsPriority, endTag, retval)
end -- inv.priority.add
end -- inv.priority.create
function inv.priority.remove(priorityName)
function inv.priority.clone(clonedPriorityName, origPriorityName, endTag)
local retval local retval
if (priorityName == nil) or (priorityName == "") then if (clonedPriorityName == nil) or (clonedPriorityName == "") then
dbot.warn("inv.priority.remove: Missing priorityName parameter") dbot.warn("inv.priority.clone: cloned priority name is missing!")
return DRL_RET_INVALID_PARAM return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INVALID_PARAM)
end -- if end -- if
if (inv.priority.table[priorityName] == nil) then if (origPriorityName == nil) or (origPriorityName == "") then
dbot.warn("inv.priority.remove: Priority table does not contain an entry for priority \"" .. dbot.warn("inv.priority.clone: original priority name is missing!")
priorityName .. "\"") return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INVALID_PARAM)
return DRL_RET_MISSING_ENTRY
end -- if end -- if
inv.priority.table[priorityName] = nil if (inv.priority.table[origPriorityName] == nil) then
dbot.warn("inv.priority.clone: original priority \"@C" .. origPriorityName .. "@W\" does not exist")
return inv.tags.stop(invTagsPriority, endTag, DRL_RET_MISSING_ENTRY)
end -- if
retval = inv.priority.save() if (inv.priority.table[clonedPriorityName] ~= nil) then
if (retval ~= DRL_RET_SUCCESS) then dbot.warn("inv.priority.clone: cloned priority \"@C" .. clonedPriorityName .. "@W\" already exists")
dbot.warn("inv.priority.remove: Failed to save priorities: " .. dbot.retval.getString(retval))
end -- if end -- if
return retval -- Copy the priority into a new table entry
end -- inv.priority.remove inv.priority.table[clonedPriorityName] = dbot.table.getCopy(inv.priority.table[origPriorityName])
-- Save the table with the new priority. We're done! :)
retval = inv.priority.save()
return inv.tags.stop(invTagsPriority, endTag, retval)
end -- inv.priority.clone
-- Returns table/nil, return value
function inv.priority.get(priorityName, level) function inv.priority.delete(priorityName, endTag)
local retval
if (priorityName == nil) or (priorityName == "") then if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.get: Missing priorityName parameter") dbot.warn("inv.priority.delete: priority name is missing!")
return nil, DRL_RET_INVALID_PARAM return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INVALID_PARAM)
end -- if end -- if
local levelNum = tonumber(level or "none") if (inv.priority.table[priorityName] == nil) then
if (levelNum == nil) then dbot.info("Skipping priority deletion: Priority \"@C" .. priorityName .. "@W\" does not exist")
dbot.warn("inv.priority.get: level parameter is not a number") return inv.tags.stop(invTagsPriority, endTag, DRL_RET_MISSING_ENTRY)
return nil, DRL_RET_INVALID_PARAM
end -- if end -- if
local priority = inv.priority.table[priorityName] retval = inv.priority.remove(priorityName)
if (priority == nil) then return inv.tags.stop(invTagsPriority, endTag, retval)
dbot.warn("inv.priority.get: Priority \"" .. priorityName .. "\" is not in the priority table") end -- inv.priority.delete
return nil, DRL_RET_MISSING_ENTRY
end -- if
-- Find the priority block for our level
local priorityBlock = nil function inv.priority.list(endTag)
for i,v in ipairs(priority) do if (inv.priority == nil) or (inv.priority.table == nil) then
if (levelNum >= v.minLevel) and (levelNum <= v.maxLevel) then dbot.error("inv.priority.list: Priority table is missing!")
priorityBlock = v return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INTERNAL_ERROR)
break;
end -- if end -- if
-- Alphabetize the priorities before we list them
local sortedPriorities = {}
local numPriorities = 0
for k,_ in pairs(inv.priority.table) do
table.insert(sortedPriorities, k)
numPriorities = numPriorities + 1
end -- for end -- for
table.sort(sortedPriorities, function (v1, v2) return v1 < v2 end)
-- Verify that we found an appropriate priority block for our level if (numPriorities == 0) then
if (priorityBlock == nil) then dbot.info("Priority table is empty")
dbot.warn("inv.priority.get: Failed to find a priority block for level " .. else
levelNum .. " in priority \"" .. priorityName .. "\"") dbot.print("@WPriorities:")
return nil for _, priority in ipairs(sortedPriorities) do
dbot.print("@W \"@C" .. priority .. "@W\"@w")
end -- for
end -- if end -- if
return priorityBlock.priorities, DRL_RET_SUCCESS return inv.tags.stop(invTagsPriority, endTag, DRL_RET_SUCCESS)
end -- inv.priority.list
end -- inv.priority.get
function inv.priority.display(priorityName, endTag) function inv.priority.display(priorityName, endTag)
@ -10558,87 +10459,44 @@ function inv.priority.display(priorityName, endTag)
return inv.tags.stop(invTagsPriority, endTag, DRL_RET_MISSING_ENTRY) return inv.tags.stop(invTagsPriority, endTag, DRL_RET_MISSING_ENTRY)
end -- if end -- if
for i, priorityBlock in ipairs(priority) do local priString = inv.priority.tableToString(priority, false, true, true)
retval = inv.priority.displayBlock(priorityBlock, priorityName)
if (retval ~= DRL_RET_SUCCESS) then dbot.print("@WPriority: \"@C" .. priorityName .. "@W\"\n")
dbot.warn("inv.priority.display: Failed to display priority block " .. i .. " for priority " .. dbot.print(priString)
priorityName .. ": " .. dbot.retval.getString(retval))
break
end -- if
end -- for
return inv.tags.stop(invTagsPriority, endTag, retval) return inv.tags.stop(invTagsPriority, endTag, retval)
end -- inv.priority.display end -- inv.priority.display
function inv.priority.displayBlock(priorityBlock, priorityName) function inv.priority.edit(priorityName, level, endTag)
local retval = DRL_RET_SUCCESS local retval = DRL_RET_SUCCESS
if (priorityBlock == nil) then if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.displayBlock: Missing priority block parameter") dbot.warn("inv.priority.edit: priority name is missing!")
return DRL_RET_INVALID_PARAM return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INVALID_PARAM)
end -- if
if (priorityBlock.minLevel == nil) or (priorityBlock.maxLevel == nil) or
(priorityBlock.priorities == nil) then
dbot.warn("inv.priority.displayBlock: Missing priority block components")
return DRL_RET_MISSING_ENTRY
end -- if end -- if
dbot.print("@WPriority \"@C" .. priorityName .. "@W\": Levels @G" .. priorityBlock.minLevel .. if (inv.priority.table[priorityName] == nil) then
"@W - @G" .. priorityBlock.maxLevel) dbot.warn("inv.priority.edit: Priority \"@C" .. priorityName .. "@W\" does not exist")
return inv.tags.stop(invTagsPriority, endTag, DRL_RET_MISSING_ENTRY)
-- We can't sort a table so create a temporary array and then sort the temporary array
local priorityArray = {}
for k, v in pairs(priorityBlock.priorities) do
table.insert(priorityArray, { name = k, value = v })
end -- for
table.sort(priorityArray, function (v1, v2) return v1.value < v2.value end)
-- Print the priorities in sorted order
for _, priorityEntry in ipairs(priorityArray) do
local valueColor = "@W"
if (priorityEntry.value < 0.7) then
valueColor = "@R"
elseif (priorityEntry.value > 1.4) then
valueColor = "@G"
end -- if end -- if
if (priorityEntry.value ~= 0) then --FIXME: add the utils call here
dbot.print(string.format(" @y%12s @W= %s%.3f", priorityEntry.name, valueColor, priorityEntry.value))
end -- if
end -- for
return retval return retval
end -- inv.priority.displayBlock end -- inv.priority.edit
function inv.priority.list(endTag) function inv.priority.split(priorityName, level, endTag)
if (inv.priority == nil) or (inv.priority.table == nil) then --FIXME: add this!
dbot.error("inv.priority.list: Priority table is missing!")
return inv.tags.stop(invTagsPriority, endTag, DRL_RET_INTERNAL_ERROR)
end -- if
-- Alphabetize the priorities before we list them end -- inv.priority.split
local sortedPriorities = {}
local numPriorities = 0
for k,_ in pairs(inv.priority.table) do
table.insert(sortedPriorities, k)
numPriorities = numPriorities + 1
end -- for
table.sort(sortedPriorities, function (v1, v2) return v1 < v2 end)
if (numPriorities == 0) then
dbot.info("Priority table is empty")
else
dbot.print("@WPriorities:")
for _, priority in ipairs(sortedPriorities) do
dbot.print("@W \"@C" .. priority .. "@W\"@w")
end -- for
end -- if
return inv.tags.stop(invTagsPriority, endTag, DRL_RET_SUCCESS) function inv.priority.join(priorityName, level, endTag)
end -- inv.priority.list --FIXME: add this!
end -- inv.priority.join
function inv.priority.compare(priorityName1, priorityName2, endTag) function inv.priority.compare(priorityName1, priorityName2, endTag)
@ -10703,6 +10561,229 @@ function inv.priority.compare(priorityName1, priorityName2, endTag)
end -- inv.priority.compare end -- inv.priority.compare
function inv.priority.new(priorityName)
local retval = DRL_RET_SUCCESS
if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.new: priority name is missing!")
return DRL_RET_INVALID_PARAM
end -- if
if (inv.priority.table[priorityName] ~= nil) then
dbot.warn("Skipping request for new priority \"@C" .. priorityName .. "@W\": priority already exists")
return DRL_RET_INVALID_PARAM
end -- if
local priorities = {}
for _, entry in ipairs(inv.priority.fieldTable) do
priorities[entry[2]] = 0
end -- if
retval = inv.priority.add(priorityName, { { minLevel = 1, maxLevel = 291, priorities = priorities } })
if (retval ~= DRL_RET_SUCCESS) then
dbot.warn("inv.priority.new: Failed to add priority \"@C" .. priorityName .. "@W\": " ..
dbot.retval.getString(retval))
end -- if
return retval
end -- inv.priority.new
function inv.priority.add(priorityName, priorityTable)
if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.add: Missing priorityName parameter")
return DRL_RET_INVALID_PARAM
end -- if
if (priorityTable == nil) then
dbot.warn("inv.priority.add: priorityTable is nil")
return DRL_RET_INVALID_PARAM
end -- if
inv.priority.table[priorityName] = priorityTable
local retval = inv.priority.save()
if (retval ~= DRL_RET_SUCCESS) then
dbot.warn("inv.priority.add: Failed to save priorities: " .. dbot.retval.getString(retval))
end -- if
return retval
end -- inv.priority.add
function inv.priority.remove(priorityName)
local retval
if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.remove: Missing priorityName parameter")
return DRL_RET_INVALID_PARAM
end -- if
if (inv.priority.table[priorityName] == nil) then
dbot.warn("inv.priority.remove: Priority table does not contain an entry for priority \"" ..
priorityName .. "\"")
return DRL_RET_MISSING_ENTRY
end -- if
inv.priority.table[priorityName] = nil
retval = inv.priority.save()
if (retval ~= DRL_RET_SUCCESS) then
dbot.warn("inv.priority.remove: Failed to save priorities: " .. dbot.retval.getString(retval))
end -- if
return retval
end -- inv.priority.remove
-- Returns table/nil, return value
function inv.priority.get(priorityName, level)
if (priorityName == nil) or (priorityName == "") then
dbot.warn("inv.priority.get: Missing priorityName parameter")
return nil, DRL_RET_INVALID_PARAM
end -- if
local levelNum = tonumber(level or "none")
if (levelNum == nil) then
dbot.warn("inv.priority.get: level parameter is not a number")
return nil, DRL_RET_INVALID_PARAM
end -- if
local priority = inv.priority.table[priorityName]
if (priority == nil) then
dbot.warn("inv.priority.get: Priority \"" .. priorityName .. "\" is not in the priority table")
return nil, DRL_RET_MISSING_ENTRY
end -- if
-- Find the priority block for our level
local priorityBlock = nil
for i,v in ipairs(priority) do
if (levelNum >= v.minLevel) and (levelNum <= v.maxLevel) then
priorityBlock = v
break;
end -- if
end -- for
-- Verify that we found an appropriate priority block for our level
if (priorityBlock == nil) then
dbot.warn("inv.priority.get: Failed to find a priority block for level " ..
levelNum .. " in priority \"" .. priorityName .. "\"")
return nil
end -- if
return priorityBlock.priorities, DRL_RET_SUCCESS
end -- inv.priority.get
-- Returns string, retval
--[[ String format looks something like this:
Field L001- L050- L100- L201-
Name L049 L099 L200 L299
int 0.800 0.900 1.000 1.000
str 1.000 1.000 0.800 0.700
...
--]]
function inv.priority.tableToString(priorityTable, doDisplayUnused, doDisplayColors, doDisplayDesc)
local retval = DRL_RET_SUCCESS
local generalPrefix, generalSuffix = "", ""
local fieldPrefix, fieldSuffix = "", ""
local levelPrefix, levelSuffix = "", ""
local descPrefix, descSuffix = "", ""
if doDisplayColors then
generalPrefix, generalSuffix = "@W", "@w"
fieldPrefix, fieldSuffix = "@C", "@w"
levelPrefix, levelSuffix = "@W", "@W"
descPrefix, descSuffix = "@c", "@w"
end -- if
-- Create the first line of the header
local priString = generalPrefix .. string.format("%12s", "Field")
for _, blockEntry in ipairs(priorityTable) do
priString = priString .. string.format(" %sL%03d-%s", levelPrefix, blockEntry.minLevel, levelSuffix)
end -- for
-- Create the second line of the header
priString = priString .. string.format("\n%12s", "Name")
for _, blockEntry in ipairs(priorityTable) do
priString = priString .. string.format(" %sL%03d%s ", levelPrefix, blockEntry.maxLevel, levelSuffix)
end -- for
priString = priString .. "\n" .. generalSuffix
for _, fieldEntry in ipairs(inv.priority.fieldTable) do
local fieldName = fieldEntry[1]
local fieldDesc = fieldEntry[2]
local useField = true
-- Check if we should display this field or not. We only use the field if at least one entry
-- block has a non-zero entry for the field or if the doDisplayUnused param is true.
if (not doDisplayUnused) then
useField = false
for _, blockEntry in ipairs(priorityTable) do
local fieldValue = tonumber(blockEntry.priorities[fieldName] or "") or 0
if (fieldValue ~= 0) then
useField = true
break
end -- if
end -- if
end -- if
if (useField) then
priString = priString .. fieldPrefix .. string.format("\n%12s", fieldName) .. fieldSuffix
for _, blockEntry in ipairs(priorityTable) do
local fieldValue = tonumber(blockEntry.priorities[fieldName] or "") or 0
local valuePrefix, valueSuffix = "", ""
if doDisplayColors then
if (fieldValue <= 0) then
valuePrefix = "@R"
elseif (fieldValue < 0.5) then
valuePrefix = "@r"
elseif (fieldValue < 0.8) then
valuePrefix = "@y"
elseif (fieldValue < 1.4) then
valuePrefix = "@w"
elseif (fieldValue < 5) then
valuePrefix = "@g"
else
valuePrefix = "@G"
end -- if
valueSuffix = "@W"
end -- if
priString = priString .. valuePrefix .. string.format(" %5.2f", fieldValue) .. valueSuffix
end -- for
if doDisplayDesc then
priString = priString .. " : " .. descPrefix .. fieldDesc .. descSuffix
end -- if
end -- if
end -- for
return priString, retval
end -- inv.priority.tableToString
-- Returns priority table entry, retval
function inv.priority.stringToTable(priorityString)
local retval = DRL_RET_SUCCESS
local priEntry = {}
--FIXME: add this!
return priEntry, retval
end -- inv.priority.stringToTable
function inv.priority.addDefault() function inv.priority.addDefault()
local retval local retval
@ -11654,6 +11735,69 @@ function inv.priority.addDefault()
end -- inv.priority.addDefault end -- inv.priority.addDefault
-- ordinal number, name, and description of each possible priority field
inv.priority.fieldTable = {
{ "str" , "Value of 1 point of the strength stat" },
{ "int" , "Value of 1 point of the intelligence stat" },
{ "wis" , "Value of 1 point of the wisdom stat" },
{ "dex" , "Value of 1 point of the dexterity stat" },
{ "con" , "Value of 1 point of the constitution stat" },
{ "luck" , "Value of 1 point of the luck stat" },
{ "dam" , "Value of 1 point of damroll" },
{ "hit" , "Value of 1 point of hitroll" },
{ "avedam" , "Value of 1 point of primary weapon ave damage" },
{ "offhandDam" , "Value of 1 point of offhand weapon ave damage" },
{ "hp" , "Value of 1 hit point" },
{ "mana" , "Value of 1 mana point" },
{ "moves" , "Value of 1 movement point" },
{ "sanctuary" , "Value placed on the sanctuary effect " },
{ "haste" , "Value placed on the haste effect " },
{ "flying" , "Value placed on the flying effect " },
{ "invis" , "Value placed on the invisible effect " },
{ "regeneration", "Value placed on the regeneration effect" },
{ "detectinvis" , "Value placed on the detect invis effect " },
{ "detecthidden", "Value placed on the detect hidden effect " },
{ "detectevil" , "Value placed on the detect evil effect " },
{ "detectgood" , "Value placed on the detect good effect " },
{ "detectmagic" , "Value placed on the detect magic effect " },
{ "dualwield" , "Value of an item's dual wield effect" },
{ "irongrip" , "Value of an item's irongrip effect" },
{ "shield" , "Value of a shield's damage reduction effect" },
{ "allmagic" , "Value of 1 point in each magical resist type" },
{ "allphys" , "Value of 1 point in each physical resist type" },
{ "bash" , "Value of 1 point of bash physical resistance" },
{ "pierce" , "Value of 1 point of pierce physical resistance" },
{ "slash" , "Value of 1 point of slash physical resistance" },
{ "acid" , "Value of 1 point of acid magical resistance" },
{ "air" , "Value of 1 point of air magical resistance" },
{ "cold" , "Value of 1 point of cold magical resistance" },
{ "disease" , "Value of 1 point of disease magical resistance" },
{ "earth" , "Value of 1 point of earth magical resistance" },
{ "electric" , "Value of 1 point of electric magical resistance" },
{ "energy" , "Value of 1 point of energy magical resistance" },
{ "fire" , "Value of 1 point of fire magical resistance" },
{ "holy" , "Value of 1 point of holy magical resistance" },
{ "light" , "Value of 1 point of light magical resistance" },
{ "magic" , "Value of 1 point of magic magical resistance" },
{ "mental" , "Value of 1 point of mental magical resistance" },
{ "negative" , "Value of 1 point of negative magical resistance" },
{ "poison" , "Value of 1 point of poison magical resistance" },
{ "shadow" , "Value of 1 point of shadow magical resistance" },
{ "sonic" , "Value of 1 point of sonic magical resistance" },
{ "water" , "Value of 1 point of water magical resistance" }
}
---------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------
-- --
-- Module to score items and sets based on a specified priority, level, and handicap -- Module to score items and sets based on a specified priority, level, and handicap

Write Preview
Loading…
Cancel
Save