Module:Skills/Gathering: Difference between revisions

Module:Skills/Gathering (view source)

Revision as of 16:28, 26 March 2024

393 bytes added , 26 March

Transform _getFarmingTable to use mw.html

Ricewind

2,875

edits

@@ Line 545: / Line 545: @@
 	end
-	local result = '{|class="wikitable sortable stickyHeader"'
+	local tbl = mw.html.create("table")
-	result = result..'\r\n|- class="headerRow-0"'
+        :addClass("wikitable sortable stickyHeader")
-	result = result..'\r\n!colspan=2|Seeds!!'..Icons.Icon({'Farming', type='skill', notext=true})..' Level'
+        :tag('tr'):addClass("headerRow-0")
-	result = result..'!!XP!!Growth Time!!Seed Value'
+        	:tag('td'):attr("colspan", 2):wikitext("Seeds")
+        	:tag('td'):wikitext(Icons.Icon({'Farming', type='skill', notext=true} .. " Level"))
+        	:tag('td'):wikitext('XP')
+        	:tag('td'):wikitext('Growth Time')
+        	:tag('td'):wikitext('Seed Value')
+        		:done()
 	if category.id == 'melvorD:Allotment' then
-		result = result..'!!colspan="2"|Crop!!Crop Healing!!Crop Value'
+		tbl	:tag('td'):attr("colspan", 2):wikitext("Crop")
+			:tag('td'):wikitext('Crop Healing')
+			:tag('td'):wikitext('Crop Value')
 	elseif category.id == 'melvorD:Herb' then
-		result = result..'!!colspan="2"|Herb!!Herb Value'
+		tbl	:tag('td'):attr("colspan", 2):wikitext("Herb")
+			:tag('td'):wikitext('Herb Value')
 	elseif category.id == 'melvorD:Tree' then
-		result = result..'!!colspan="2"|Logs!!Log Value'
+		tbl	:tag('td'):attr("colspan", 2):wikitext("Logs")
+			:tag('td'):wikitext('Log Value')
 	end
-	result = result..'!!Seed Sources'
+	tbl = tbl
+	tbl:tag('td'):wikitext('Seed Sources')
 	table.sort(seedList, function(a, b) return a.level < b.level end)
@@ Line 564: / Line 575: @@
 		local productItem = Items.getItemByID(seed.productId)
 		if seedItem ~= nil and productItem ~= nil then
-			result = result..'\r\n|-'
+			tbl :tag('tr')
-			result = result..'\r\n|'..Icons.Icon({seedItem.name, type='item', size='50', notext=true})
+					:tag('td'):wikitext(Icons.Icon({seedItem.name, type='item', size='50', notext=true}))
-			result = result..'|| ' .. Icons.getExpansionIcon(seedItem.id) .. Icons.Icon({seedItem.name, type='item', noicon=true})
+					:tag('td'):wikitext(Icons.getExpansionIcon(seedItem.id) .. Icons.Icon({seedItem.name, type='item', noicon=true}))
-			result = result..'||'..seed.level..'||'..Shared.formatnum(seed.baseExperience)
+					:tag('td'):wikitext(seed.level)
-			result = result..'||data-sort-value="'..(seed.baseInterval / 1000)..'"|'..Shared.timeString(seed.baseInterval / 1000, true)
+					:tag('td'):wikitext(Shared.formatnum(seed.baseExperience))
-			result = result..'||data-sort-value="'..seedItem.sellsFor..'"|'..Icons.GP(seedItem.sellsFor)
+					:tag('td'):attr('data-sort-value', (seed.baseInterval / 1000))
-			result = result..'||'..Icons.Icon({productItem.name, type='item', size='50', notext=true})
+							  :wikitext(Shared.timeString(seed.baseInterval / 1000, true))
-			result = result..'|| ' .. Icons.getExpansionIcon(productItem.id) .. Icons.Icon({productItem.name, type='item', noicon=true})
+					:tag('td'):attr('data-sort-value', seedItem.sellsFor)
+						      :wikitext(Icons.GP(seedItem.sellsFor))
+					:tag('td'):wikitext(Icons.Icon({productItem.name, type='item', size='50', notext=true}))
+					:tag('td'):wikitext(Icons.getExpansionIcon(productItem.id) .. Icons.Icon({productItem.name, type='item', noicon=true}))
 			if category.id == 'melvorD:Allotment' then
-				result = result..'||'..Icons.Icon({'Hitpoints', type='skill', notext=true})..' '..((productItem.healsFor or 0) * 10)
+				tbl :tag('td'):wikitext(Icons.Icon({'Hitpoints', type='skill', notext=true}))
+							  :wikitext(' ')
+							  :wikitext(((productItem.healsFor or 0) * 10))
 			end
-			result = result..'||data-sort-value="'..productItem.sellsFor..'"|'..Icons.GP(productItem.sellsFor)
+			tbl = tbl
-			result = result..'||'..ItemSourceTables._getItemSources(seedItem)
+			tbl :tag('td'):attr('data-sort-value', productItem.sellsFor)
+						  :wikitext(Icons.GP(productItem.sellsFor))
+				:tag('td'):wikitext(ItemSourceTables._getItemSources(seedItem))
 		end
 	end
-	result = result..'\r\n|}'
+	return tostring(tbl:done())
-	return result
 end