Module:GoodsData - Revision history

76561198157077871 at 20:09, 31 August 2025

2025-08-31T20:09:13Z

← Older revision		Revision as of 20:09, 31 August 2025
Line 173:		Line 173:
	-- Utility module retrieves the data as basic, flat lua tables. We don't		-- Utility module retrieves the data as basic, flat lua tables. We don't
	-- need to use the header lookup table that's returned with the data table.		-- need to use the header lookup table that's returned with the data table.
	local originalGoodsTable, _ = CsvUtils.extractTables(DATA_TEMPLATE_NAME)		--local originalGoodsTable, _ = CsvUtils.extractTables(DATA_TEMPLATE_NAME)

	-- Now restructure to be more conducive for data about goods.		-- Now restructure to be more conducive for data about goods.
	local allTables = ~~restructureGoodsTable~~(~~originalGoodsTable~~)		local allTables = mw.loadData("Module:GoodsData/Data")
	goodsTable = allTables[1]		goodsTable = allTables[1]
	mapNamesToIDs = allTables[2]		mapNamesToIDs = allTables[2]

76561198157077871 at 20:06, 31 August 2025

2025-08-31T20:06:28Z

← Older revision		Revision as of 20:06, 31 August 2025
Line 176:		Line 176:

	-- Now restructure to be more conducive for data about goods.		-- Now restructure to be more conducive for data about goods.
	~~goodsTable~~ = restructureGoodsTable(originalGoodsTable)		local allTables = restructureGoodsTable(originalGoodsTable)
			goodsTable = allTables[1]
			mapNamesToIDs = allTables[2]


	end		end

76561197969631737: rounding sell and buy values to 2 decimal places

2024-10-12T14:31:29Z

rounding sell and buy values to 2 decimal places

← Older revision		Revision as of 14:31, 12 October 2024
Line 521:		Line 521:
	function GoodsData.getSellValue(id)		function GoodsData.getSellValue(id)
	load()		load()
	return goodsTable[id] ~= nil and ~~goodsTable[id][INDEX_SELL_VALUE]~~		local value = goodsTable[id][INDEX_SELL_VALUE]
			return goodsTable[id] ~= nil and tonumber(string.format("%.2f", value))
	end		end

	function GoodsData.getSellValueAfterPrestigePenalty(id)		function GoodsData.getSellValueAfterPrestigePenalty(id)
	load()		load()
	~~return goodsTable[id] ~~~= ~~nil and~~ goodsTable[id][INDEX_SELL_VALUE] / 2		local value = goodsTable[id][INDEX_SELL_VALUE] / 2
			return goodsTable[id] ~= nil and tonumber(string.format("%.2f", value))
	end		end

	function GoodsData.getBuyValue(id)		function GoodsData.getBuyValue(id)
	load()		load()
	return goodsTable[id] ~= nil and ~~goodsTable[id][INDEX_BUY_VALUE]~~		local value = goodsTable[id][INDEX_BUY_VALUE]
			return goodsTable[id] ~= nil and tonumber(string.format("%.2f", value))
	end		end

76561197969631737: added goods interface (simpler function names)

2024-10-12T14:05:24Z

added goods interface (simpler function names)

@@ Line 177: / Line 177: @@
 	-- Now restructure to be more conducive for data about goods.
 	goodsTable = restructureGoodsTable(originalGoodsTable)
 end
@@ Line 474: / Line 481: @@
 	return good[INDEX_ICON_FILENAME]
 end
 --endregion
 return GoodsData

76561198028096046: Changed VALUE_DIVISOR from 10 to 12 to have accurate amber values.

2024-01-21T07:33:49Z

Changed VALUE_DIVISOR from 10 to 12 to have accurate amber values.

← Older revision		Revision as of 07:33, 21 January 2024
Line 85:		Line 85:
	local DATA_TEMPLATE_NAME = "Template:Goods_csv"		local DATA_TEMPLATE_NAME = "Template:Goods_csv"

	local VALUE_DIVISOR = 10		local VALUE_DIVISOR = 12

	local INDEX_ID = "id"		local INDEX_ID = "id"

76561197969631737: now dividing values by 10 to be correct

2023-12-02T04:25:40Z

now dividing values by 10 to be correct

← Older revision		Revision as of 04:25, 2 December 2023
Line 84:		Line 84:

	local DATA_TEMPLATE_NAME = "Template:Goods_csv"		local DATA_TEMPLATE_NAME = "Template:Goods_csv"

			local VALUE_DIVISOR = 10

	local INDEX_ID = "id"		local INDEX_ID = "id"
Line 146:		Line 148:
	newGood[INDEX_BURN_TIME] = 0		newGood[INDEX_BURN_TIME] = 0
	end		end
	newGood[INDEX_SELL_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_SELL_VALUE])		newGood[INDEX_SELL_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_SELL_VALUE]) / VALUE_DIVISOR
	newGood[INDEX_BUY_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_BUY_VALUE])		newGood[INDEX_BUY_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_BUY_VALUE]) / VALUE_DIVISOR
	newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"		newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"

76561197969631737: Now stores the right fields as actual numbers instead of strings of numbers

2023-11-26T04:05:16Z

Now stores the right fields as actual numbers instead of strings of numbers

← Older revision		Revision as of 04:05, 26 November 2023
Line 142:		Line 142:
	newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"		newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"
	if newGood[INDEX_BURNABLE] then		if newGood[INDEX_BURNABLE] then
	newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]		newGood[INDEX_BURN_TIME] = tonumber(originalGood[INDEX_ORIGINAL_BURN_TIME])
	else		else
	newGood[INDEX_BURN_TIME] = 0		newGood[INDEX_BURN_TIME] = 0
	end		end
	newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]		newGood[INDEX_SELL_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_SELL_VALUE])
	newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]		newGood[INDEX_BUY_VALUE] = tonumber(originalGood[INDEX_ORIGINAL_BUY_VALUE])
	newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"		newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"

76561197969631737: now skips loading data where the ID contains the term "tutorial"

2023-11-25T16:12:28Z

now skips loading data where the ID contains the term "tutorial"

← Older revision		Revision as of 16:12, 25 November 2023
Line 95:		Line 95:
	local INDEX_BUY_VALUE = "tradingBuyValue"		local INDEX_BUY_VALUE = "tradingBuyValue"
	local INDEX_ICON_FILENAME = "iconName"		local INDEX_ICON_FILENAME = "iconName"

			local PATTERN_TUTORIAL = "tutorial"

	--endregion		--endregion
Line 129:		Line 131:
	for _, originalGood in ipairs(originalGoodsTable[DATA_ROWS]) do		for _, originalGood in ipairs(originalGoodsTable[DATA_ROWS]) do

	-- Copy over the content, mapping unhelpful indexes into headers keys.		-- Skip over any rows where the ID contains the tutorial term.
	local newGood = {}		if not string.find(originalGood[INDEX_ORIGINAL_ID], PATTERN_TUTORIAL) then
	newGood[INDEX_ID] = originalGood[INDEX_ORIGINAL_ID]		-- Copy over the content, mapping unhelpful indexes into headers keys.
	newGood[INDEX_NAME] = originalGood[INDEX_ORIGINAL_NAME]		local newGood = {}
	newGood[INDEX_DESCRIPTION] = originalGood[INDEX_ORIGINAL_DESCRIPTION]		newGood[INDEX_ID] = originalGood[INDEX_ORIGINAL_ID]
	newGood[INDEX_CATEGORY] = originalGood[INDEX_ORIGINAL_CATEGORY]		newGood[INDEX_NAME] = originalGood[INDEX_ORIGINAL_NAME]
	newGood[INDEX_EATABLE] = originalGood[INDEX_ORIGINAL_EATABLE] == "True"		newGood[INDEX_DESCRIPTION] = originalGood[INDEX_ORIGINAL_DESCRIPTION]
	newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"		newGood[INDEX_CATEGORY] = originalGood[INDEX_ORIGINAL_CATEGORY]
	if newGood[INDEX_BURNABLE] then		newGood[INDEX_EATABLE] = originalGood[INDEX_ORIGINAL_EATABLE] == "True"
	newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]		newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"
	else		if newGood[INDEX_BURNABLE] then
	newGood[INDEX_BURN_TIME] = 0		newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]
	end		else
	newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]		newGood[INDEX_BURN_TIME] = 0
	newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]		end
	newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"		newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]
			newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]
			newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"

	-- Also populate the map for looking up IDs with display names		-- Also populate the map for looking up IDs with display names
	mapNamesToIDs[newGood[INDEX_NAME]] = newGood[INDEX_ID]		mapNamesToIDs[newGood[INDEX_NAME]] = newGood[INDEX_ID]

	newGoodsTable[newGood[INDEX_ID]] = newGood		newGoodsTable[newGood[INDEX_ID]] = newGood
			end
	end		end

76561197969631737: fixed a nil reference

2023-11-20T02:43:02Z

fixed a nil reference

← Older revision		Revision as of 02:43, 20 November 2023
Line 120:		Line 120:
	local INDEX_ORIGINAL_BURNABLE = 6		local INDEX_ORIGINAL_BURNABLE = 6
	local INDEX_ORIGINAL_BURN_TIME = 7		local INDEX_ORIGINAL_BURN_TIME = 7
			local INDEX_ORIGINAL_SELL_VALUE = 8
			local INDEX_ORIGINAL_BUY_VALUE = 9
			local INDEX_ORIGINAL_ICON_FILENAME = 10

	mapNamesToIDs = {}		mapNamesToIDs = {}
Line 134:		Line 137:
	newGood[INDEX_EATABLE] = originalGood[INDEX_ORIGINAL_EATABLE] == "True"		newGood[INDEX_EATABLE] = originalGood[INDEX_ORIGINAL_EATABLE] == "True"
	newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"		newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"
	newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]		if newGood[INDEX_BURNABLE] then
			newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]
			else
			newGood[INDEX_BURN_TIME] = 0
			end
	newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]		newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]
	newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]		newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]

76561197969631737: Change restructuring method to be linear instead of looping; no functional change

2023-11-20T02:06:39Z

Change restructuring method to be linear instead of looping; no functional change

← Older revision		Revision as of 02:06, 20 November 2023
Line 91:		Line 91:
	local INDEX_EATABLE = "eatable"		local INDEX_EATABLE = "eatable"
	local INDEX_BURNABLE = "canBeBurned"		local INDEX_BURNABLE = "canBeBurned"
	local ~~INDEX_BURNTIME~~ = "burningTime"		local INDEX_BURN_TIME = "burningTime"
	local INDEX_SELL_VALUE = "tradingSellValue"		local INDEX_SELL_VALUE = "tradingSellValue"
	local INDEX_BUY_VALUE = "tradingBuyValue"		local INDEX_BUY_VALUE = "tradingBuyValue"
Line 112:		Line 112:

	-- A few constants we'll need only within this function.		-- A few constants we'll need only within this function.
	~~local HEADER_ROW = 1~~
	local DATA_ROWS = 2		local DATA_ROWS = 2
			local INDEX_ORIGINAL_ID = 1
			local INDEX_ORIGINAL_NAME = 2
			local INDEX_ORIGINAL_DESCRIPTION= 3
			local INDEX_ORIGINAL_CATEGORY = 4
			local INDEX_ORIGINAL_EATABLE = 5
			local INDEX_ORIGINAL_BURNABLE = 6
			local INDEX_ORIGINAL_BURN_TIME = 7

	mapNamesToIDs = {}		mapNamesToIDs = {}
Line 122:		Line 128:
	-- Copy over the content, mapping unhelpful indexes into headers keys.		-- Copy over the content, mapping unhelpful indexes into headers keys.
	local newGood = {}		local newGood = {}
	~~for index, key in pairs(originalGoodsTable~~[~~HEADER_ROW~~]~~) do~~		newGood[INDEX_ID] = originalGood[INDEX_ORIGINAL_ID]
			newGood[INDEX_NAME] = originalGood[INDEX_ORIGINAL_NAME]
			newGood[INDEX_DESCRIPTION] = originalGood[INDEX_ORIGINAL_DESCRIPTION]
			newGood[INDEX_CATEGORY] = originalGood[INDEX_ORIGINAL_CATEGORY]
			newGood[INDEX_EATABLE] = originalGood[INDEX_ORIGINAL_EATABLE] == "True"
			newGood[INDEX_BURNABLE] = originalGood[INDEX_ORIGINAL_BURNABLE] == "True"
			newGood[INDEX_BURN_TIME] = originalGood[INDEX_ORIGINAL_BURN_TIME]
			newGood[INDEX_SELL_VALUE] = originalGood[INDEX_ORIGINAL_SELL_VALUE]
			newGood[INDEX_BUY_VALUE] = originalGood[INDEX_ORIGINAL_BUY_VALUE]
			newGood[INDEX_ICON_FILENAME] = originalGood[INDEX_ORIGINAL_ICON_FILENAME] .. ".png"

	-- ~~Convert string versions of true/false to actual booleans~~		-- Also populate the map for looking up IDs with display names
	~~if key == INDEX_EATABLE or key == INDEX_BURNABLE then~~		mapNamesToIDs[newGood[INDEX_NAME]] = newGood[INDEX_ID]
	newGood[~~key] = originalGood[index~~] ~~== "True"~~
	~~else~~
	~~-- Append the file extension to the icon filename.~~
	~~if key == INDEX_ICON_FILENAME then~~
	~~newGood[key~~] = ~~originalGood[index] .. ".png"~~
	~~else~~
	~~-- Everything else can be directly copied over.~~
	newGood[~~key] = originalGood[index~~]
	~~end~~
	~~end~~
	~~end~~

	newGoodsTable[newGood[INDEX_ID]] = newGood		newGoodsTable[newGood[INDEX_ID]] = newGood

	~~-- Also populate the map for looking up IDs with display names~~
	~~mapNamesToIDs[newGood[INDEX_NAME]] = newGood[INDEX_ID]~~
	end		end

Line 370:		Line 371:
	end		end

	return good[~~INDEX_BURNTIME~~]		return good[INDEX_BURN_TIME]
	end		end