Module:RecipeData - Revision history

76561198157077871 at 20:40, 31 August 2025

2025-08-31T20:40:21Z

← Older revision		Revision as of 20:40, 31 August 2025
Line 99:		Line 99:
	-- recipes, which are the recipes themselves and the workshops (production)		-- recipes, which are the recipes themselves and the workshops (production)
	-- workshops.		-- workshops.
	local originalRecipeTable, recipeHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(RECIPE_DATA_TEMPLATE_NAME))		--local originalRecipeTable, recipeHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(RECIPE_DATA_TEMPLATE_NAME))
	local originalWorkshopTable, workshopsHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(WORKSHOPS_DATA_TEMPLATE_NAME))		--local originalWorkshopTable, workshopsHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(WORKSHOPS_DATA_TEMPLATE_NAME))
	local originalGoodsTable, goodsHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(GOODS_DATA_TEMPLATE_NAME))		--local originalGoodsTable, goodsHeaderLookup = CsvUtils.luaTableFromCSV(CsvUtils.extractCSV(GOODS_DATA_TEMPLATE_NAME))

	-- Now restructure the tables so subtables can be passed to member functions		-- Now restructure the tables so subtables can be passed to member functions
	-- for cleaner code.		-- for cleaner code.
	recipeTable = restructureRecipeTable(originalRecipeTable, recipeHeaderLookup)		--recipeTable = restructureRecipeTable(originalRecipeTable, recipeHeaderLookup)
	workshopTable = restructureWorkshopTable(originalWorkshopTable, workshopsHeaderLookup)		--workshopTable = restructureWorkshopTable(originalWorkshopTable, workshopsHeaderLookup)
	goodsTable = restructureGoodsTable(originalGoodsTable, goodsHeaderLookup)		--goodsTable = restructureGoodsTable(originalGoodsTable, goodsHeaderLookup)

			-- New, optimized data loading structure
			allTables = mw.loadData("Module:RecipeData/Data")
			recipeTable = allTables[1]
			recipeIDToWorkshopID = allTables[2]
			workshopTable = allTables[3]
			workshopNameToWorkshopID = allTables[4]
			goodsTable = allTables[5]
			goodsNameToGoodID = allTables[6]


	end		end

76561197969631737: yet another typo in the new method; it was hard to unit test :/

2023-11-10T14:23:04Z

yet another typo in the new method; it was hard to unit test :/

← Older revision		Revision as of 14:23, 10 November 2023
Line 391:		Line 391:
	end		end

	return workshopTable[~~targetGoodID~~]		return workshopTable[targetWorkshopID]
	end		end

76561197969631737: yet another typo in the new method; it was hard to unit test :/

2023-11-10T14:20:57Z

yet another typo in the new method; it was hard to unit test :/

← Older revision		Revision as of 14:20, 10 November 2023
Line 382:		Line 382:
	function RecipeData.getAllDataForWorkshop(workshopName)		function RecipeData.getAllDataForWorkshop(workshopName)

	if not ~~workshopsTable~~ then		if not workshopTable then
	loadRecipes()		loadRecipes()
	end		end
Line 391:		Line 391:
	end		end

	return ~~workshopsTable~~[targetGoodID]		return workshopTable[targetGoodID]
	end		end

76561197969631737: another typo in new method to support workshops

2023-11-10T14:19:38Z

another typo in new method to support workshops

← Older revision		Revision as of 14:19, 10 November 2023
Line 383:		Line 383:

	if not workshopsTable then		if not workshopsTable then
	~~loadData~~()		loadRecipes()
	end		end

76561197969631737: type in new method to support workshops

2023-11-10T14:17:50Z

type in new method to support workshops

← Older revision		Revision as of 14:17, 10 November 2023
Line 912:		Line 912:

	if not workshopTable then		if not workshopTable then
	~~loadData~~()		loadRecipes()
	end		end

76561197969631737: augmenting to work with workshops

2023-11-10T14:07:31Z

augmenting to work with workshops

@@ Line 367: / Line 367: @@
 	return goodsTable[targetIngredientID], ingredMatches
 end
@@ Line 508: / Line 535: @@
 --		construction time
 --		required goods {
---			required good #1 stack size
+--			#1 { stack size, id }
---			required good #1 id
+--			#2 { stack size, id }
---			required good #2 stack size
+--			#3 { stack size, id }
 --		}
 --		workplaces {
@@ Line 600: / Line 624: @@
 	-- A subtable to return
 	local requiredGoods = {}
 	for i = 1,REQ_GOOD_MAX do
 		local oldIndex = workshopsHeaderLookup[LOOKUP_REQ_GOOD_BASE_STRING .. i]
 		-- Split the digit part into the req'd good stack size and the rest
 		-- of the text into the req'd good's id.
-		requiredGoods[k], requiredGoods[k+1] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
+		newGroup[1], newGroup[2] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
-		k = k + 2 -- move +2 for each original +1
+		table.insert(requiredGoods, newGroup)
 	end
@@ Line 866: / Line 887: @@
 -- @param goodID the ID of the good to look up
 -- @return display name, icon filename
-function getGoodNameAndIcon(goodID)
+function RecipeData.getGoodNameAndIcon(goodID)
 	if not recipeTable or not workshopTable or not goodsTable then
@@ Line 879: / Line 900: @@
 	return good[INDEX_GOOD_NAME], good[INDEX_GOOD_ICON_FILENAME]
 end

76561197969631737: Undo revision 2731 by 76561197969631737 (talk)

2023-11-10T13:15:20Z

Undo revision 2731 by 76561197969631737 (talk)

@@ Line 367: / Line 367: @@
 	return goodsTable[targetIngredientID], ingredMatches
 end
@@ Line 535: / Line 508: @@
 --		construction time
 --		required goods {
---			#1 { stack size, id }
+--			required good #1 stack size
---			#2 { stack size, id }
+--			required good #1 id
---			#3 { stack size, id }
+--			required good #2 stack size
 --		}
 --		workplaces {
@@ Line 624: / Line 600: @@
 	-- A subtable to return
 	local requiredGoods = {}
 	for i = 1,REQ_GOOD_MAX do
 		local oldIndex = workshopsHeaderLookup[LOOKUP_REQ_GOOD_BASE_STRING .. i]
 		-- Split the digit part into the req'd good stack size and the rest
 		-- of the text into the req'd good's id.
-		newGroup[1], newGroup[2] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
+		requiredGoods[k], requiredGoods[k+1] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
-		table.insert(requiredGoods, newGroup)
+		k = k + 2 -- move +2 for each original +1
 	end
@@ Line 887: / Line 866: @@
 -- @param goodID the ID of the good to look up
 -- @return display name, icon filename
-function RecipeData.getGoodNameAndIcon(goodID)
+function getGoodNameAndIcon(goodID)
 	if not recipeTable or not workshopTable or not goodsTable then
@@ Line 900: / Line 879: @@
 	return good[INDEX_GOOD_NAME], good[INDEX_GOOD_ICON_FILENAME]
 end

76561197969631737: Updated with a new public function

2023-11-10T13:13:13Z

Updated with a new public function

@@ Line 367: / Line 367: @@
 	return goodsTable[targetIngredientID], ingredMatches
 end
@@ Line 508: / Line 535: @@
 --		construction time
 --		required goods {
---			required good #1 stack size
+--			#1 { stack size, id }
---			required good #1 id
+--			#2 { stack size, id }
---			required good #2 stack size
+--			#3 { stack size, id }
 --		}
 --		workplaces {
@@ Line 600: / Line 624: @@
 	-- A subtable to return
 	local requiredGoods = {}
 	for i = 1,REQ_GOOD_MAX do
 		local oldIndex = workshopsHeaderLookup[LOOKUP_REQ_GOOD_BASE_STRING .. i]
 		-- Split the digit part into the req'd good stack size and the rest
 		-- of the text into the req'd good's id.
-		requiredGoods[k], requiredGoods[k+1] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
+		newGroup[1], newGroup[2] = oldWorkshop[oldIndex]:match(PATTERN_SPLIT_STACK_AND_ID)
-		k = k + 2 -- move +2 for each original +1
+		table.insert(requiredGoods, newGroup)
 	end
@@ Line 866: / Line 887: @@
 -- @param goodID the ID of the good to look up
 -- @return display name, icon filename
-function getGoodNameAndIcon(goodID)
+function RecipeData.getGoodNameAndIcon(goodID)
 	if not recipeTable or not workshopTable or not goodsTable then
@@ Line 879: / Line 900: @@
 	return good[INDEX_GOOD_NAME], good[INDEX_GOOD_ICON_FILENAME]
 end

76561197969631737: New version of the template code that is easier to maintain, references the CSV data, and can now do ingredients too.

2023-11-05T21:41:05Z

New version of the template code that is easier to maintain, references the CSV data, and can now do ingredients too.

Show changes

76561197969631737: changed return values to nil

2023-02-13T01:16:41Z

changed return values to nil

← Older revision		Revision as of 01:16, 13 February 2023
Line 346:		Line 346:
	-- check input		-- check input
	if not argBuildingName then		if not argBuildingName then
	return ~~"Recipe_Data Error: building not given."~~		return nil
	end		end

Line 377:		Line 377:

	if 0 == #recipesFoundHere then		if 0 == #recipesFoundHere then
	return ~~"Recipe_Data Error: building has no recipes."~~		return nil
	end		end