Module:WeaponData - Revision history

RandomX: Attempt to use slowdamage for proper labeling...

2024-09-01T22:14:06Z

Attempt to use slowdamage for proper labeling...

RandomX: Attempt to use proper times symbol.

2024-06-23T00:05:55Z

Attempt to use proper times symbol.

Histidine: Fix special data handling of multiple rows

2024-05-18T08:32:58Z

Fix special data handling of multiple rows

Histidine: Undo revision 9322 by Histidine (talk)

2024-05-12T04:45:57Z

Undo revision 9322 by Histidine (talk)

Histidine: Handling for Stardust heat

2024-05-12T03:46:42Z

Handling for Stardust heat

Histidine at 03:39, 12 May 2024

2024-05-12T03:39:37Z

Histidine: Append projectile count to damage values

2024-05-11T14:24:58Z

Append projectile count to damage values

Histidine: Weapon count indicator

2024-05-11T13:58:49Z

Weapon count indicator

Histidine: Fix crash when no extraData

2024-05-11T13:49:29Z

Fix crash when no extraData

Histidine at 13:41, 11 May 2024

2024-05-11T13:41:33Z

@@ Line 37: / Line 37: @@
 				num = addCustomLabel(templateArgs, "Spawn Life (s)", entry.expire, num)
 			elseif entry.type == 'areadamage' then
-				local typeName = entry.grav and "Gravity Well" or "Ground Burn"
+				local typeName = entry.grav and "Gravity Well" or wd.slowdamage and "Ground Slow" or "Ground Burn"
 				if not grav then
 					num = addCustomLabel(templateArgs, typeName .. " DPS", entry.dps, num)

@@ Line 97: / Line 97: @@
 	w.extraData = nil
 	if (w.count and w.count > 1) then
-		w.name = w.name .. " x " .. w.count
+		w.name = w.name .. "&nbsp;&times;&nbsp;" .. w.count
 	end
 	if (w.projectiles and w.projectiles > 1) then
-		local append = " x " ..  w.projectiles
+		local append = "&nbsp;&times;&nbsp;" ..  w.projectiles
 		if w.damage then w.damage = w.damage .. append end
 		if w.empdamage then w.empdamage = w.empdamage .. append end

@@ Line 11: / Line 11: @@
 	end
 	index = index + 1
 end
@@ Line 29: / Line 30: @@
 		if type(entry) == 'table' then
 			if entry.type == 'shielddrain' then
-				addCustomLabel(templateArgs, "Shield drain (HP/shot)", entry.drain, num)
+				num = addCustomLabel(templateArgs, "Shield drain (HP/shot)", entry.drain, num)
 			elseif entry.type == 'needs_link' then
-				addCustomLabel(templateArgs, "Grid needed", entry.power, num)
+				num = addCustomLabel(templateArgs, "Grid needed", entry.power, num)
 			elseif entry.type == 'spawn' then
-				addCustomLabel(templateArgs, "Spawns Unit", "[[" .. entry.name .. "]]", num)
+				num = addCustomLabel(templateArgs, "Spawns Unit", "[[" .. entry.name .. "]]", num)
-				addCustomLabel(templateArgs, "Spawn Life (s)", entry.expire, num)
+				num = addCustomLabel(templateArgs, "Spawn Life (s)", entry.expire, num)
 			elseif entry.type == 'areadamage' then
 				local typeName = entry.grav and "Gravity Well" or "Ground Burn"
 				if not grav then
-					addCustomLabel(templateArgs, typeName .. " DPS", entry.dps, num)
+					num = addCustomLabel(templateArgs, typeName .. " DPS", entry.dps, num)
 				end
-				addCustomLabel(templateArgs, typeName .. " radius (elmo)", entry.radius, num)
+				num = addCustomLabel(templateArgs, typeName .. " radius (elmo)", entry.radius, num)
-				addCustomLabel(templateArgs, typeName .. " duration (s)", entry.duration, num)
+				num = addCustomLabel(templateArgs, typeName .. " duration (s)", entry.duration, num)
 			elseif entry.type == 'stockpile' then
-				addCustomLabel(templateArgs, "Stockpile time (s)", entry.time, num)
+				num = addCustomLabel(templateArgs, "Stockpile time (s)", entry.time, num)
 				if (entry.cost) then
-					addCustomLabel(templateArgs, "Stockpile cost (M)", entry.cost, num)
+					num = addCustomLabel(templateArgs, "Stockpile cost (M)", entry.cost, num)
 				end
 			end
 		else
 			if entry == 'hitscan' then
-				addCustomLabel(templateArgs, nil, "Instantly hits", num)
+				num = addCustomLabel(templateArgs, nil, "Instantly hits", num)
 			elseif entry == 'ignoreshield' then
-				addCustomLabel(templateArgs, nil, "Ignores shields", num)
+				num = addCustomLabel(templateArgs, nil, "Ignores shields", num)
 			elseif entry == 'smoothsground' then
-				addCustomLabel(templateArgs, nil, "Smooths ground", num)
+				num = addCustomLabel(templateArgs, nil, "Smooths ground", num)
 			elseif entry == 'hightraj' then
-				addCustomLabel(templateArgs, nil, "High trajectory", num)
+				num = addCustomLabel(templateArgs, nil, "High trajectory", num)
 			elseif entry == 'trajtoggle' then
-				addCustomLabel(templateArgs, nil, "Trajectory toggle", num)
+				num = addCustomLabel(templateArgs, nil, "Trajectory toggle", num)
 			elseif entry == 'watercapable' then
-				addCustomLabel(templateArgs, nil, "Water capable", num)
+				num = addCustomLabel(templateArgs, nil, "Water capable", num)
 			elseif entry == 'friendlyfire' then
-				addCustomLabel(templateArgs, nil, "Potential friendly fire", num)
+				num = addCustomLabel(templateArgs, nil, "Potential friendly fire", num)
 			elseif entry == 'nofriendlyfire' then
-				addCustomLabel(templateArgs, nil, "No friendly fire", num)
+				num = addCustomLabel(templateArgs, nil, "No friendly fire", num)
 			elseif entry == 'nogroundcollide' then
-				addCustomLabel(templateArgs, nil, "Passes through ground", num)
+				num = addCustomLabel(templateArgs, nil, "Passes through ground", num)
 			elseif entry == 'piercing' then
-				addCustomLabel(templateArgs, nil, "Damage increase vs large units", num)
+				num = addCustomLabel(templateArgs, nil, "Damage increase vs large units", num)
 			elseif entry == 'damagefalloff' then
-				addCustomLabel(templateArgs, nil, "Damage falls off with range", num)
+				num = addCustomLabel(templateArgs, nil, "Damage falls off with range", num)
 			elseif entry == 'inaccuratevsmoving' then
-				addCustomLabel(templateArgs, nil, "Inaccuracy vs moving targets", num)
+				num = addCustomLabel(templateArgs, nil, "Inaccuracy vs moving targets", num)
 			elseif entry == 'interceptedbyantinuke' then
-				addCustomLabel(templateArgs, nil, "Can be shot down by antinukes", num)
+				num = addCustomLabel(templateArgs, nil, "Can be shot down by antinukes", num)
 			end
 		end

@@ Line 11: / Line 11: @@
 	end
 	index = index + 1
 end
@@ Line 129: / Line 111: @@
 function weapon.printInfobox(frame)
-	local result = frame:expandTemplate(weapon.getInfoboxTemplate(frame))
+	return frame:expandTemplate(weapon.getInfoboxTemplate(frame))
 end
 return weapon

@@ Line 11: / Line 11: @@
 	end
 	index = index + 1
 end
@@ Line 111: / Line 129: @@
 function weapon.printInfobox(frame)
-	return frame:expandTemplate(weapon.getInfoboxTemplate(frame))
+	local result = frame:expandTemplate(weapon.getInfoboxTemplate(frame))
 end
 return weapon

@@ Line 15: / Line 15: @@
 function weapon.getData(frame)
 	if not frame then return '' end
-	local weaponDefName = frame.args[1]
+	local weaponDefName = frame.args.defname or frame.args[1] or "<no name specified>"
 	local wd = weaponData[weaponDefName]
 	if not (wd) then return 'weapondef ' .. weaponDefName .. ' not found' end
-	local property = frame.args[2]
+	local property = (frame.args.defname == nil) and frame.args[2] or frame.args[1]
 	local result = wd[property]
 	if not result then result = '' end
@@ Line 24: / Line 24: @@
 end
-local function addSpecialDataToTemplate(templateArgs, frameArgs, wd)
+local function addSpecialDataToTemplate(templateArgs, wd)
 	local num = 1
 	for index, entry in ipairs(wd.extraData or {}) do
@@ Line 85: / Line 85: @@
 	local tbl = {title = "Infobox zkweapon", args = {}}
 	local w = tbl.args
-	local wd = weaponData[args.defname]
+	local defName = args.defname or args[1] or "<no name specified>"
-	if not (wd) then return 'weapondef ' .. args.defname .. ' not found' end
+	local wd = weaponData[defName]
-	addSpecialDataToTemplate(w, args, wd)
+	addSpecialDataToTemplate(w, wd)
 	for key, value in pairs(wd) do

@@ Line 94: / Line 94: @@
 	end
 	w.extraData = nil
 	return tbl