モジュール:DamageTable - 版の履歴

Mntone: 2次的なダメージ使用時にスカルピアサーライフリングを含めた表が生成できない不具合の修正

2022-08-10T03:59:45Z

2次的なダメージ使用時にスカルピアサーライフリングを含めた表が生成できない不具合の修正

@@ 768行目: / 768行目: @@
+		}
 		info.level2first = info.level2
 	elseif hasSecond and not noLegsShot2 then
 		colspan = 3

Mntone: HSLカラーの変換にカラーライブラリーのサブセットを使用

2022-06-22T07:13:39Z

HSLカラーの変換にカラーライブラリーのサブセットを使用

@@ 6行目: / 6行目: @@
 local aw    = require('Module:Utility/Library')
 local apex  = require('Module:Utility/ApexLibrary')
 local STKCalculator = require('Module:Apex/STKCalculator')
 local getArgs -- lazily initialized
 local function getShotCount(part, health, shield, info, gunshield)
@@ 128行目: / 89行目: @@
 	end
 	row:tag('td')
 		:attrIf(rowspan > 1, { rowspan = rowspan })
 		:attr('data-tooltip', table.concat(tooltip))
-		:css('background-color', getColorAsString((info.diffCount < 5 and 0.65 or 0.85) * ratio))
+		:css('background-color', tostring(color))
 		:wikitext(shotCount)
 end

Mntone: ヘッドショットに対するパッシブ倍率の無効化を無効にする機能を実装（過去のシールドプリセットで使う）

2022-05-24T23:12:18Z

ヘッドショットに対するパッシブ倍率の無効化を無効にする機能を実装（過去のシールドプリセットで使う）

← 古い版		2022年5月25日 (水) 08:12時点における版
697行目:		697行目:

	opts = {		opts = {
	ampedCover = true,		ampedCover = true,
	beamdamage = math.max(args.beamdamage, args.beamdamagemax),		beamdamage = math.max(args.beamdamage, args.beamdamagemax),
	beamticks = math.max(args.ticks, args.ticksmax),		beamticks = math.max(args.ticks, args.ticksmax),
	charged = math.max(args.charged, args.chargedmax),		charged = math.max(args.charged, args.chargedmax),
	disruptorRounds = math.max(args.disruptor, args.disruptorsup),		disruptorRounds = math.max(args.disruptor, args.disruptorsup),
	gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,		gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,
	hammerpointRounds = math.max(args.hammerpoint, args.hammerpointsup),		hammerpointRounds = math.max(args.hammerpoint, args.hammerpointsup),
	passthrough = 1,		ignorePassiveForHeadshot = shieldinfo.sameHeadshotDamageToNormalOnFortified,
	pellets = math.max(args.pellet, args.pelletmax),		passthrough = 1,
	round = args.round,		pellets = math.max(args.pellet, args.pelletmax),
			round = args.round,
	}		}
	})		})
722行目:		723行目:

	opts = {		opts = {
	ampedCover = false,		ampedCover = false,
	beamdamage = math.min(args.beamdamage, args.beamdamagemin),		beamdamage = math.min(args.beamdamage, args.beamdamagemin),
	beamticks = math.min(args.ticks, args.ticksmin),		beamticks = math.min(args.ticks, args.ticksmin),
	charged = 1,		charged = 1,
	disruptorRounds = 1,		disruptorRounds = 1,
	gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,		gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,
	hammerpointRounds = 1,		hammerpointRounds = 1,
	passthrough = math.min(args.passthrough, args.passthroughsup),		ignorePassiveForHeadshot = shieldinfo.sameHeadshotDamageToNormalOnFortified,
	pellets = math.min(args.pellet, args.pelletmin),		passthrough = math.min(args.passthrough, args.passthroughsup),
	round = args.round,		pellets = math.min(args.pellet, args.pelletmin),
			round = args.round,
	}		}
	}		}
754行目:		756行目:

	opts = {		opts = {
	ampedCover = args.amped,		ampedCover = args.amped,
	beamdamage = args.beamdamage,		beamdamage = args.beamdamage,
	beamticks = args.ticks,		beamticks = args.ticks,
	charged = args.charged,		charged = args.charged,
	disruptorRounds = args.disruptor,		disruptorRounds = args.disruptor,
	gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,		gunshieldBleedthrough = shieldinfo.gunshieldBleedthrough,
	hammerpointRounds = args.hammerpoint,		hammerpointRounds = args.hammerpoint,
	passthrough = args.passthrough,		ignorePassiveForHeadshot = shieldinfo.sameHeadshotDamageToNormalOnFortified,
	pellets = args.pellet,		passthrough = args.passthrough,
	round = args.round,		pellets = args.pellet,
			round = args.round,
	},		},
	}		}

Mntone: 横書きセルの場合に鉄壁の倍率を表示できるように改善

2022-05-24T14:44:57Z

横書きセルの場合に鉄壁の倍率を表示できるように改善

← 古い版		2022年5月24日 (火) 23:44時点における版
976行目:		976行目:
	rowinfoSecondTop = info.level1gunshiled		rowinfoSecondTop = info.level1gunshiled
	rowinfoSecondGunShield = info.level2gunshiled		rowinfoSecondGunShield = info.level2gunshiled
	label2 = string.format(res.targets.fortified_prefix, label)		label2 = string.format(res.targets.fortified_prefix, args.mul2, label)
	else		else
	rowinfoSecondTop = info.level1		rowinfoSecondTop = info.level1
	rowinfoSecondGunShield = nil		rowinfoSecondGunShield = nil
	label2 = string.format(res.targets.fortified_prefix, label)		label2 = string.format(res.targets.fortified_prefix, args.mul2, label)
	end		end

Mntone: 胴体と脚のダメージが同一の際に鉄壁のための専用のセルを生成しないように改善

2022-05-24T14:37:21Z

胴体と脚のダメージが同一の際に鉄壁のための専用のセルを生成しないように改善

← 古い版		2022年5月24日 (火) 23:37時点における版
680行目:		680行目:
	end		end
	local hasSecond = args.mul2 > 0 and args.mul2 ~= 1		local hasSecond = args.mul2 > 0 and args.mul2 ~= 1
			local noLegsShot = args.leg < 0 or args.leg >= 1 or (shieldinfo.legAsBodyOnLowProfile and args.mul > 1)
			local noLegsShot2 = args.leg < 0 or args.leg >= 1 or (shieldinfo.legAsBodyOnLowProfile and args.mul2 > 1)

	-- Get/calc min count		-- Get/calc min count
800行目:		802行目:
	}		}
	info.level2first = info.level2		info.level2first = info.level2
	elseif hasSecond then		elseif hasSecond and not noLegsShot2 then
	colspan = 3		colspan = 3
	info = {		info = {
817行目:		819行目:
	},		},
	level2gunshiled = {		level2gunshiled = {
	{ breaktop = false, breakbottom = false, rowspan = 2, content = res.targets.fortified, vertical = res.targets.fortified_vertical, verticalAlign = res.targets.fortified_verticalalign },		{ breaktop = false, breakbottom = false, rowspan = 3, content = res.targets.fortified, vertical = res.targets.fortified_vertical, verticalAlign = res.targets.fortified_verticalalign },
	{ breaktop = false, breakbottom = true, colspan = 2 },		{ breaktop = false, breakbottom = true, colspan = 2 },
	},		},
934行目:		936行目:

	-- Body shot damage		-- Body shot damage
	~~local noLegsShot = perkedDamages.scale_legs < 0 or perkedDamages.scale_legs >= 1 or (shieldinfo.legAsBodyOnLowProfile and args.mul > 1)~~
	local label		local label
	if headMul <= 1 then		if headMul <= 1 then
967行目:		968行目:
	-- the 2nd place of damages		-- the 2nd place of damages
	if hasSecond then		if hasSecond then
	if not ~~noLegsShot~~ then		local rowinfoSecondTop, rowinfoSecondGunShield, label2
	info.level2gunshiled[1].~~rowspan~~ = 3		if not noLegsShot2 then
			rowinfoSecondTop = info.level2gunshiled
			rowinfoSecondGunShield = info.level3gunshiled
			label2 = label
			elseif args.mul2 < 1 then
			rowinfoSecondTop = info.level1gunshiled
			rowinfoSecondGunShield = info.level2gunshiled
			label2 = string.format(res.targets.fortified_prefix, label)
			else
			rowinfoSecondTop = info.level1
			rowinfoSecondGunShield = nil
			label2 = string.format(res.targets.fortified_prefix, label)
	end		end

975行目:		987行目:
	local perkedDamages2 = applyPerkAndShieldScaleToDamages(baseDamages, weaponinfo2.mul, shieldinfo.sameHeadshotDamageToNormalOnFortified, weaponinfo2.opts)		local perkedDamages2 = applyPerkAndShieldScaleToDamages(baseDamages, weaponinfo2.mul, shieldinfo.sameHeadshotDamageToNormalOnFortified, weaponinfo2.opts)
	if args.mul2 < 1 then		if args.mul2 < 1 then
	renderRow2(table, ~~label~~, nil, perkedDamages2, 'body', weaponinfo2, ~~info.level2gunshiled~~, res)		renderRow2(table, label2, nil, perkedDamages2, 'body', weaponinfo2, rowinfoSecondTop, res)
	renderRow(		renderRow(
	table,		table,
	res.targets.gunshield,		res.targets.gunshield,
	shieldinfo.gunshieldLabel,		shieldinfo.gunshieldLabel,
	1, weaponinfo2, ~~info.level3gunshiled~~, res, shieldinfo.gunshield)		1, weaponinfo2, rowinfoSecondGunShield, res, shieldinfo.gunshield)
	else		else
	renderRow2(table, ~~label~~, nil, perkedDamages2, 'body', weaponinfo2, info.level2, res)		renderRow2(table, label2, nil, perkedDamages2, 'body', weaponinfo2, info.level2, res)
	end		end

	-- Legs shot damage		-- Legs shot damage
	if not ~~noLegsShot~~ then		if not noLegsShot2 then
	local legsLabel = string.format(res.targets.legs, args.leg)		local legsLabel = string.format(res.targets.legs, args.leg)
	renderRow2(table, legsLabel, nil, perkedDamages2, 'legs', weaponinfo2, info.level2, res)		renderRow2(table, legsLabel, nil, perkedDamages2, 'legs', weaponinfo2, info.level2, res)

Mntone: 頭や鉄壁のセル自体を縦書きに変更

2022-05-24T10:47:11Z

頭や鉄壁のセル自体を縦書きに変更

← 古い版		2022年5月24日 (火) 19:47時点における版
169行目:		169行目:
	cell:wikitext(name)		cell:wikitext(name)
	elseif cellinfo.content then		elseif cellinfo.content then
	cell:wikitext(cellinfo.content)		if cellinfo.vertical then
			cell:addClass('vertical-cell')
			:tag('span')
			:wikitext(cellinfo.content)
			else
			cell:wikitext(cellinfo.content)
			end
	else		else
	cell:wikitext('  ')		cell:wikitext('  ')
784行目:		790行目:
	},		},
	level3first = {		level3first = {
	hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 6, content = res.targets.head, verticalAlign = ~~'top'~~ } or { breaktop = true, breakbottom = false, rowspan = 6 },		hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 6, content = res.targets.head, vertical = res.targets.head_vertical, verticalAlign = res.targets.head_verticalalign } or { breaktop = true, breakbottom = false, rowspan = 6 },
	{ breaktop = false, breakbottom = true },		{ breaktop = false, breakbottom = true },
	{ breaktop = false, breakbottom = false, showbottom = true },		{ breaktop = false, breakbottom = false, showbottom = true },
807行目:		813行目:
	},		},
	level2first = {		level2first = {
	hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 3, content = res.targets.head, verticalAlign = ~~'top'~~ } or { breaktop = true, breakbottom = false, rowspan = 3 },		hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 3, content = res.targets.head, vertical = res.targets.head_vertical, verticalAlign = res.targets.head_verticalalign } or { breaktop = true, breakbottom = false, rowspan = 3 },
	{ breaktop = false, breakbottom = false, colspan = 2 },		{ breaktop = false, breakbottom = false, colspan = 2 },
	},		},
	level2gunshiled = {		level2gunshiled = {
	{ breaktop = false, breakbottom = false, rowspan = 2, content = res.targets.fortified_vertical, verticalAlign = ~~'top'~~ },		{ breaktop = false, breakbottom = false, rowspan = 2, content = res.targets.fortified, vertical = res.targets.fortified_vertical, verticalAlign = res.targets.fortified_verticalalign },
	{ breaktop = false, breakbottom = true, colspan = 2 },		{ breaktop = false, breakbottom = true, colspan = 2 },
	},		},
835行目:		841行目:
	},		},
	level2first = {		level2first = {
	hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 3, content = res.targets.head, verticalAlign = ~~'top'~~ } or { breaktop = true, breakbottom = false, rowspan = 3 },		hideNoHelmets and { breaktop = false, breakbottom = false, rowspan = 3, content = res.targets.head, vertical = res.targets.head_vertical, verticalAlign = res.targets.head_verticalalign } or { breaktop = true, breakbottom = false, rowspan = 3 },
	{ breaktop = false, breakbottom = false },		{ breaktop = false, breakbottom = false },
	},		},

Mntone: 鉄壁のための2次的なダメージを追加できるように実装

2022-05-24T03:41:05Z

鉄壁のための2次的なダメージを追加できるように実装

@@ 670行目: / 670行目: @@
 		minHead = args.headmax
 	end
 	-- Get/calc min count
@@ 790行目: / 794行目: @@
+		}
 		info.level2first = info.level2
 	else
 		colspan = 2
@@ 925行目: / 957行目: @@
 		local legsLabel = string.format(res.targets.legs, args.leg)
 		renderRow2(table, legsLabel, nil, perkedDamages, 'legs', weaponinfo, info.level1, res)
 	end
@@ 952行目: / 1,011行目: @@
 		legmin = 0,
 		mul = 1,
 		mulmin = 0.85,
 		mulmax = 1,

Mntone: ツールチップのヘッドショット倍率の変数に計算後の値が入っていた問題の修正

2022-05-21T00:14:32Z

ツールチップのヘッドショット倍率の変数に計算後の値が入っていた問題の修正

← 古い版		2022年5月21日 (土) 09:14時点における版
574行目:		574行目:
	local hed2Label = string.format(res.targets.helmet2, damages.scale_hed2)		local hed2Label = string.format(res.targets.helmet2, damages.scale_hed2)
	local hed3Label = string.format(res.targets.helmet3, damages.scale_hed3)		local hed3Label = string.format(res.targets.helmet3, damages.scale_hed3)
	local hed1Tooltip = string.format(helmets.level1.text, damages.~~scale_hed1~~)		local hed1Tooltip = string.format(helmets.level1.text, damages.scale_hed0)
	local hed2Tooltip = string.format(helmets.level2.text, damages.~~scale_hed2~~)		local hed2Tooltip = string.format(helmets.level2.text, damages.scale_hed0)
	local hed3Tooltip = string.format(helmets.level3.text, damages.~~scale_hed3~~)		local hed3Tooltip = string.format(helmets.level3.text, damages.scale_hed0)

	if not helmets.level0.disabled then		if not helmets.level0.disabled then

Mntone: ヘッドショットに対する鉄壁倍率を無効化する機能を実装

2022-05-11T04:23:53Z

ヘッドショットに対する鉄壁倍率を無効化する機能を実装

← 古い版		2022年5月11日 (水) 13:23時点における版
451行目:		451行目:

	-- Apply perk/shield scale to damages		-- Apply perk/shield scale to damages
	local function applyPerkAndShieldScaleToDamages(damages, perkScale, opts)		local function applyPerkAndShieldScaleToDamages(damages, perkScale, ignorePerkScaleForHS, opts)
	if perkScale ~= 1 then		if perkScale ~= 1 then
	if opts.disruptorRounds > 1 then		if opts.disruptorRounds > 1 then
	return table.map(damages, function(key, val)		return table.map(damages, function(key, val)
	if aw.stringstarts(key, 'shield_') or aw.stringstarts(key, 'unshld_') or aw.stringstarts(key, 'dschrg_') then		if ignorePerkScaleForHS and (aw.stringstarts(key, 'shield_hed') or aw.stringstarts(key, 'unshld_hed') or aw.stringstarts(key, 'dschrg_hed')) then
			if aw.stringstarts(key, 'shield_') then
			return apex.calcDisruptorDamage(val, opts.disruptorRounds)
			else
			return val
			end
			elseif aw.stringstarts(key, 'shield_') or aw.stringstarts(key, 'unshld_') or aw.stringstarts(key, 'dschrg_') then
	local perkedDamage = apex.calcPassiveDamage(val, perkScale, { round = opts.round })		local perkedDamage = apex.calcPassiveDamage(val, perkScale, { round = opts.round })
	if aw.stringstarts(key, 'shield_') then		if aw.stringstarts(key, 'shield_') then
468行目:		474行目:
	else		else
	return table.map(damages, function(key, val)		return table.map(damages, function(key, val)
	if aw.stringstarts(key, 'shield_') or aw.stringstarts(key, 'unshld_') or aw.stringstarts(key, 'dschrg_') then		if ignorePerkScaleForHS and (aw.stringstarts(key, 'shield_hed') or aw.stringstarts(key, 'unshld_hed') or aw.stringstarts(key, 'dschrg_hed')) then
			return val
			elseif aw.stringstarts(key, 'shield_') or aw.stringstarts(key, 'unshld_') or aw.stringstarts(key, 'dschrg_') then
	return apex.calcPassiveDamage(val, perkScale, { round = opts.round })		return apex.calcPassiveDamage(val, perkScale, { round = opts.round })
	else		else
816行目:		824行目:

	local baseDamages = calcBaseDamages(weaponinfo.damage, headMul, args.leg, weaponinfo.helmets, weaponinfo.opts)		local baseDamages = calcBaseDamages(weaponinfo.damage, headMul, args.leg, weaponinfo.helmets, weaponinfo.opts)
	local perkedDamages = applyPerkAndShieldScaleToDamages(baseDamages, weaponinfo.mul, weaponinfo.opts)		local perkedDamages = applyPerkAndShieldScaleToDamages(baseDamages, weaponinfo.mul, shieldinfo.sameHeadshotDamageToNormalOnFortified, weaponinfo.opts)
	renderHeader(table, args.mul, colspan, shieldinfo.shields, res)		renderHeader(table, args.mul, colspan, shieldinfo.shields, res)

Mntone: デフォルトのシールドプリセット設定を変更

2022-05-10T16:38:21Z

デフォルトのシールドプリセット設定を変更

← 古い版		2022年5月11日 (水) 01:38時点における版
997行目:		997行目:
	args.rarity = args.rarity or 'epic'		args.rarity = args.rarity or 'epic'
	args.skullpiercerrarity = args.skullpiercerrarity or 'legendary'		args.skullpiercerrarity = args.skullpiercerrarity or 'legendary'
	args.shieldpreset = args.shieldpreset or '~~removelowprofile~~'		args.shieldpreset = args.shieldpreset or 'reinforcehelmets'

	return tostring(renderTable(args))		return tostring(renderTable(args))