432
edits
Module:Skills/Cartography: Difference between revisions
no edit summary
(getHexMasteryBonusTable: Added to generate table of hex mastery bonuses) |
No edit summary |
||
| (4 intermediate revisions by the same user not shown) | |||
| Line 12: | Line 12: | ||
for i, POI in pairs(SkillData.Cartography.worldMaps[1].pointsOfInterest) do | for i, POI in pairs(SkillData.Cartography.worldMaps[1].pointsOfInterest) do | ||
if POI.id == id then | if POI.id == id then | ||
return POI | |||
end | |||
end | |||
return nil | |||
end | |||
function p.getPointOfInterestByXY(X, Y) | |||
local hex = p.getHexByXY(X, Y) | |||
if hex == nil then | |||
return nil | |||
end | |||
for i, POI in pairs(SkillData.Cartography.worldMaps[1].pointsOfInterest) do | |||
if (POI.coords.q == hex.coordinates.q and | |||
POI.coords.r == hex.coordinates.r) then | |||
return POI | return POI | ||
end | end | ||
| Line 263: | Line 277: | ||
end | end | ||
function p._getDiscoveryRewardsTable( | function p._getDiscoveryRewardsTable(items) | ||
local POIs = {} | local POIs = {} | ||
for i, POI in ipairs(SkillData.Cartography.worldMaps[1].pointsOfInterest) do | for i, POI in ipairs(SkillData.Cartography.worldMaps[1].pointsOfInterest) do | ||
if POI.discoveryRewards ~= nil and POI.discoveryRewards.items ~= nil then | if POI.discoveryRewards ~= nil and POI.discoveryRewards.items ~= nil then | ||
for i, reward in ipairs(POI.discoveryRewards.items) do | for i, reward in ipairs(POI.discoveryRewards.items) do | ||
if reward.id == item.id then | for j, item in ipairs(items) do | ||
if reward.id == item.id then | |||
table.insert(POIs, POI) | |||
break | |||
end | |||
end | end | ||
end | end | ||
| Line 304: | Line 321: | ||
function p.getDiscoveryRewardsTable(frame) | function p.getDiscoveryRewardsTable(frame) | ||
local | local itemNames = frame.args ~= nil and frame.args[1] or frame | ||
local item = Items.getItem(itemName) | local items = {} | ||
if | for itemName in string.gmatch(itemNames, "[^,]*") do | ||
return Shared.printError('No | item = Items.getItem(itemName) | ||
if item ~= nil then | |||
table.insert(items, item) | |||
end | |||
end | |||
if #items == nil then | |||
return Shared.printError('No items found in game data for: "' .. itemNames .. '"') | |||
end | end | ||
local resultTable = p._getDiscoveryRewardsTable( | local resultTable = p._getDiscoveryRewardsTable(items) | ||
if resultTable == '' then | if resultTable == '' then | ||
return '' | return '' | ||
| Line 315: | Line 338: | ||
return '==POI Discovery Rewards==\n' .. resultTable | return '==POI Discovery Rewards==\n' .. resultTable | ||
end | end | ||
end | |||
function p.hex(frame) | |||
-- Default behavior, when no coords supplied | |||
if (frame == nil or frame.args['x'] == nil or frame.args['y'] == nil) then | |||
return 'Hex' | |||
end | |||
local X = tonumber(frame.args['x']) | |||
local Y = tonumber(frame.args['y']) | |||
if X == nil or Y == nil then | |||
return '<invalid XY format>' | |||
elseif X < 0 or Y < 0 or X > 31 or Y > 29 or (Y == 29 and X % 2 == 0) then | |||
return '<out of range (' .. X .. ',' .. Y .. ')>' | |||
end | |||
-- | |||
local noicon = frame.args['noicon'] or false | |||
local coords = '<span>(' .. X .. ',' .. Y .. ')</span>' | |||
local hex = p.getPointOfInterestByXY(X, Y) | |||
-- nil means just a normal hex | |||
if hex == nil or hex['id'] == nil or noicon then | |||
return coords | |||
end | |||
-- Valid POI so consider decorations | |||
local notext = frame.args['notext'] or false | |||
local nolink = frame.args['nolink'] or false | |||
local poi_icon = Icons.Icon({hex['name'], type='poi', notext=notext or nil, nolink=nolink or nil, size='25'}) | |||
return '<span>' .. poi_icon .. ' ' .. coords .. '</span>' | |||
end | end | ||
| Line 322: | Line 372: | ||
if POI.discoveryRewards ~= nil and POI.discoveryRewards.items ~= nil then | if POI.discoveryRewards ~= nil and POI.discoveryRewards.items ~= nil then | ||
local item = Items.getItemByID(POI.discoveryRewards.items[1].id) | local item = Items.getItemByID(POI.discoveryRewards.items[1].id) | ||
table.insert(testTable, p._getDiscoveryRewardsTable(item)) | table.insert(testTable, p._getDiscoveryRewardsTable({item})) | ||
end | |||
end | |||
return table.concat(testTable) | |||
end | |||
function p.testHex() | |||
local testTable = {} | |||
for x = 0, 31 do | |||
for y = 0, 29 do | |||
if y == 29 and x % 2 == 1 then | |||
-- no tile here | |||
else | |||
item = p.hex({args={x=x, y=y}}) | |||
table.insert(testTable, item) | |||
end | |||
end | end | ||
end | end | ||