モジュール:Apex/STKCalculator - 版の履歴

Mntone: ヘッドショットに対するパッシブ倍率を無効化する機能をフラグで有効・無効にできるように変更

2022-05-24T23:11:43Z

ヘッドショットに対するパッシブ倍率を無効化する機能をフラグで有効・無効にできるように変更

← 古い版		2022年5月25日 (水) 08:11時点における版
287行目:		287行目:
	ampedCover = opts.ampedCover or false,		ampedCover = opts.ampedCover or false,
	round = opts.round or false,		round = opts.round or false,
			ignorePassiveForHeadshot = opts.ignorePassiveForHeadshot ~= false,
	},		},
	}, { __index = STKCalculator })		}, { __index = STKCalculator })
349行目:		350行目:
	function apex.calcShotCount(base, part, passive, health, shield, gunshield, opts)		function apex.calcShotCount(base, part, passive, health, shield, gunshield, opts)
	opts = opts or {}		opts = opts or {}
	opts.ampedCover = opts.ampedCover or false		opts.ampedCover = opts.ampedCover or false
	opts.bodyshot = part or opts.bodyshot or 1		opts.bodyshot = part or opts.bodyshot or 1
	opts.disruptorRounds = opts.disruptorRounds or 0		opts.disruptorRounds = opts.disruptorRounds or 0
	opts.hammerpointRounds = opts.hammerpointRounds or 0		opts.hammerpointRounds = opts.hammerpointRounds or 0
	opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false		opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false
	opts.passthrough = opts.passthrough or 1		opts.ignorePassiveForHeadshot = opts.ignorePassiveForHeadshot ~= false
	opts.pellets = opts.pellets or 1		opts.passthrough = opts.passthrough or 1
	opts.round = opts.round or false		opts.pellets = opts.pellets or 1
			opts.round = opts.round or false

	local stkc = STKCalculator.new(base, opts)		local stkc = STKCalculator.new(base, opts)

Mntone: ヘッドショット・レッグショット・ハンマーポイント弾・ディスラプター弾の倍率のデータ参照を新形式のものに変更

2021-09-16T07:40:00Z

ヘッドショット・レッグショット・ハンマーポイント弾・ディスラプター弾の倍率のデータ参照を新形式のものに変更

← 古い版		2021年9月16日 (木) 16:40時点における版
294行目:		294行目:

	function STKCalculator.newFromStat(stat, opts)		function STKCalculator.newFromStat(stat, opts)
	local damagestat, pellets		local stat2, damagestat, pellets
	if stat.anvil_receiver and opts.useAnvilReceiver then		if stat.anvil_receiver and opts.useAnvilReceiver then
			stat2 = stat.anvil_receiver
	damagestat = stat.anvil_receiver.damage or stat.damage		damagestat = stat.anvil_receiver.damage or stat.damage
	pellets = opts.pellets or stat.anvil_receiver.pellet or stat.pellet		pellets = opts.pellets or stat.anvil_receiver.pellet or stat.pellet
	elseif stat.shatter_caps and opts.useShatterCaps then		elseif stat.shatter_caps and opts.useShatterCaps then
			stat2 = stat.shatter_caps
	damagestat = stat.shatter_caps.damage or stat.damage		damagestat = stat.shatter_caps.damage or stat.damage
	pellets = opts.pellets or stat.shatter_caps.pellet or stat.pellet		pellets = opts.pellets or stat.shatter_caps.pellet or stat.pellet
	else		else
			stat2 = stat
	damagestat = stat.damage		damagestat = stat.damage
	pellets = opts.pellets or stat.pellet		pellets = opts.pellets or stat.pellet
331行目:		334行目:
	return STKCalculator.new(damage, {		return STKCalculator.new(damage, {
	bodyshot = opts.bodyshot,		bodyshot = opts.bodyshot,
	headshot = ~~damagestat~~.~~headshot~~,		headshot = stat2.damage_head_scale or stat.damage_head_scale,
	legsshot = ~~damagestat~~.~~legshot~~,		legsshot = stat2.damage_legs_scale or stat.damage_legs_scale,
	skyshot = opts.skyshot,		skyshot = opts.skyshot,
	passthrough = opts.passthrough,		passthrough = opts.passthrough,
339行目:		342行目:
	beamdamage = beamdamage,		beamdamage = beamdamage,
	beamticks = beamticks,		beamticks = beamticks,
	disruptorRounds = opts.useDisruptorRounds and ~~damagestat~~.disruptor_rounds or 0,		disruptorRounds = opts.useDisruptorRounds and stat.disruptor_rounds and stat.disruptor_rounds.damage_shield_scale or 0,
	hammerpointRounds = opts.useHammerpointRounds and ~~damagestat~~.hammerpoint_rounds or 0,		hammerpointRounds = opts.useHammerpointRounds and stat.hammerpoint_rounds and stat.hammerpoint_rounds.damage_unshielded_scale or 0,
	})		})
	end		end

Mntone: チャージ倍率が正しく計算されていなかった不具合の修正

2021-09-10T03:24:22Z

チャージ倍率が正しく計算されていなかった不具合の修正

← 古い版		2021年9月10日 (金) 12:24時点における版
263行目:		263行目:
	if opts.ampedCover then		if opts.ampedCover then
	damage = aw.round(1.2 * damage)		damage = aw.round(1.2 * damage)
			end

			-- チャージ倍率が有効
			if opts.charged then
			damage = aw.round(opts.charged * damage)
	end		end

Mntone: ディスラプター弾の計算順番が間違っていた不具合の修正

2021-08-07T04:54:21Z

ディスラプター弾の計算順番が間違っていた不具合の修正

← 古い版		2021年8月7日 (土) 13:54時点における版
59行目:		59行目:
	end		end

	local function calcDamage(base, passthrough, partmul, passive, opts, ~~midfunc~~)		local function calcDamage(base, passthrough, partmul, passive, opts, finalfunc)
	-- 貫通減衰倍率		-- 貫通減衰倍率
	if passthrough < 1 then		if passthrough < 1 then
65行目:		65行目:
	end		end

	-- ~~部位倍率~~		-- 部位倍率、小柄・鉄壁
	base = apex.~~calcPartDamage~~(base, partmul)		base = apex.calcDamageFromPartAndPassive(base, partmul, passive, opts)

	-- ~~中間関数~~		-- 最終関数
	if ~~midfunc~~ then		if finalfunc then
	base = ~~midfunc~~(base)		base = finalfunc(base)
	end		end

	~~-- 小柄・鉄壁~~
	~~base = apex.calcPassiveDamage(base, passive, opts)~~

	return base		return base
	end		end

	function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart, ~~midfunc~~)		function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart, finalfunc)
	local partmul = self:_getPartMultiplier(forcePart)		local partmul = self:_getPartMultiplier(forcePart)
	local damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, ~~midfunc~~)		local damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, finalfunc)
	local hasBeam = self.beamdamage > 0 and self.beamticks > 0		local hasBeam = self.beamdamage > 0 and self.beamticks > 0
	local beamdamage		local beamdamage
108行目:		105行目:

	partmul = self:_getPartMultiplier(forcePart)		partmul = self:_getPartMultiplier(forcePart)
	damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, ~~midfunc~~)		damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, finalfunc)
	if hasBeam then		if hasBeam then
	beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)		beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)
177行目:		174行目:
	if self.disruptorRounds > 1 then		if self.disruptorRounds > 1 then
	-- シールド		-- シールド
	local ~~midfunc~~ = function(damage)		local finalfunc = function(damage)
	return apex.calcDisruptorDamage(damage, self.disruptorRounds)		return apex.calcDisruptorDamage(damage, self.disruptorRounds)
	end		end
	shield = self:_calcShotToKill(self.damage, passive, shield, isGreaterThanOrEqualToDamage, false, nil, ~~midfunc~~)		shield = self:_calcShotToKill(self.damage, passive, shield, isGreaterThanOrEqualToDamage, false, nil, finalfunc)

	-- シールドと体力の混合		-- シールドと体力の混合

Mntone: シャッターキャップに対応

2021-05-20T09:08:29Z

シャッターキャップに対応

← 古い版		2021年5月20日 (木) 18:08時点における版
292行目:		292行目:

	function STKCalculator.newFromStat(stat, opts)		function STKCalculator.newFromStat(stat, opts)
	local damagestat		local damagestat, pellets
	if opts.useAnvilReceiver then		if stat.anvil_receiver and opts.useAnvilReceiver then
	damagestat = stat.anvil_receiver and stat.~~anvil_receiver~~.damage or stat.damage		damagestat = stat.anvil_receiver.damage or stat.damage
			pellets = opts.pellets or stat.anvil_receiver.pellet or stat.pellet
			elseif stat.shatter_caps and opts.useShatterCaps then
			damagestat = stat.shatter_caps.damage or stat.damage
			pellets = opts.pellets or stat.shatter_caps.pellet or stat.pellet
	else		else
	damagestat = stat.damage		damagestat = stat.damage
			pellets = opts.pellets or stat.pellet
	end		end

329行目:		334行目:
	passthrough = opts.passthrough,		passthrough = opts.passthrough,
	pattern = opts.pattern,		pattern = opts.pattern,
	pellets = ~~opts.~~pellets ~~or stat.pellet~~,		pellets = pellets,
	beamdamage = beamdamage,		beamdamage = beamdamage,
	beamticks = beamticks,		beamticks = beamticks,

Mntone: 新しいアンビルレシーバーのデータ構造に対応

2021-05-20T08:45:21Z

新しいアンビルレシーバーのデータ構造に対応

← 古い版		2021年5月20日 (木) 17:45時点における版
294行目:		294行目:
	local damagestat		local damagestat
	if opts.useAnvilReceiver then		if opts.useAnvilReceiver then
	damagestat = stat.~~damage~~.anvil_receiver or stat.damage		damagestat = stat.anvil_receiver and stat.anvil_receiver.damage or stat.damage
	else		else
	damagestat = stat.damage		damagestat = stat.damage

Mntone: 貫通減衰倍率の確殺数算出を実装

2021-03-29T11:35:27Z

貫通減衰倍率の確殺数算出を実装

← 古い版		2021年3月29日 (月) 20:35時点における版
59行目:		59行目:
	end		end

	local function calcDamage(base, partmul, passive, opts, midfunc)		local function calcDamage(base, passthrough, partmul, passive, opts, midfunc)
			-- 貫通減衰倍率
			if passthrough < 1 then
			base = apex.calcPassthroughDamage(base, passthrough)
			end

	-- 部位倍率		-- 部位倍率
	base = apex.calcPartDamage(base, partmul)		base = apex.calcPartDamage(base, partmul)
76行目:		81行目:
	function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart, midfunc)		function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart, midfunc)
	local partmul = self:_getPartMultiplier(forcePart)		local partmul = self:_getPartMultiplier(forcePart)
	local damage = calcDamage(base, partmul, passive, self.opts, midfunc)		local damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, midfunc)
	local hasBeam = self.beamdamage > 0 and self.beamticks > 0		local hasBeam = self.beamdamage > 0 and self.beamticks > 0
	local beamdamage		local beamdamage
103行目:		108行目:

	partmul = self:_getPartMultiplier(forcePart)		partmul = self:_getPartMultiplier(forcePart)
	damage = calcDamage(base, partmul, passive, self.opts, midfunc)		damage = calcDamage(base, self.passthrough, partmul, passive, self.opts, midfunc)
	if hasBeam then		if hasBeam then
	beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)		beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)
264行目:		269行目:

	local obj = setmetatable({		local obj = setmetatable({
	damage = damage,		damage = damage,
	bodyshot = opts.bodyshot or 1,		bodyshot = opts.bodyshot or 1,
	headshot = opts.headshot or 2,		headshot = opts.headshot or 2,
	legsshot = opts.legsshot or 0.75,		legsshot = opts.legsshot or 0.75,
	skyshot = opts.skyshot or 0,		skyshot = opts.skyshot or 0,
	pattern = opts.pattern,		passthrough = opts.passthrough or 1,
	pellets = opts.pellets or 1,		pattern = opts.pattern,
	beamdamage = opts.beamdamage or 0,		pellets = opts.pellets or 1,
	beamticks = opts.beamticks or 0,		beamdamage = opts.beamdamage or 0,
			beamticks = opts.beamticks or 0,
	disruptorRounds = opts.disruptorRounds or 0,		disruptorRounds = opts.disruptorRounds or 0,
	hammerpointRounds = opts.hammerpointRounds or 0,		hammerpointRounds = opts.hammerpointRounds or 0,
317行目:		323行目:

	return STKCalculator.new(damage, {		return STKCalculator.new(damage, {
	bodyshot = opts.bodyshot,		bodyshot = opts.bodyshot,
	headshot = damagestat.headshot,		headshot = damagestat.headshot,
	legsshot = damagestat.legshot,		legsshot = damagestat.legshot,
	skyshot = opts.skyshot,		skyshot = opts.skyshot,
	pattern = opts.pattern,		passthrough = opts.passthrough,
	pellets = opts.pellets or stat.pellet,		pattern = opts.pattern,
	beamdamage = beamdamage,		pellets = opts.pellets or stat.pellet,
	beamticks = beamticks,		beamdamage = beamdamage,
			beamticks = beamticks,
	disruptorRounds = opts.useDisruptorRounds and damagestat.disruptor_rounds or 0,		disruptorRounds = opts.useDisruptorRounds and damagestat.disruptor_rounds or 0,
	hammerpointRounds = opts.useHammerpointRounds and damagestat.hammerpoint_rounds or 0,		hammerpointRounds = opts.useHammerpointRounds and damagestat.hammerpoint_rounds or 0,
337行目:		344行目:
	opts.hammerpointRounds = opts.hammerpointRounds or 0		opts.hammerpointRounds = opts.hammerpointRounds or 0
	opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false		opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false
			opts.passthrough = opts.passthrough or 1
	opts.pellets = opts.pellets or 1		opts.pellets = opts.pellets or 1
	opts.round = opts.round or false		opts.round = opts.round or false
344行目:		352行目:
	return stkc:getTable()		return stkc:getTable()
	end		end
			STKCalculator.calcShotCount = apex.calcShotCount

	return STKCalculator		return STKCalculator

Mntone: ディスラプター弾に対応

2021-03-26T01:52:22Z

ディスラプター弾に対応

← 古い版		2021年3月26日 (金) 10:52時点における版
59行目:		59行目:
	end		end

	function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart)		local function calcDamage(base, partmul, passive, opts, midfunc)
			-- 部位倍率
			base = apex.calcPartDamage(base, partmul)

			-- 中間関数
			if midfunc then
			base = midfunc(base)
			end

			-- 小柄・鉄壁
			base = apex.calcPassiveDamage(base, passive, opts)

			return base
			end

			function STKCalculator:_calcShotToKill(base, passive, points, cond, isLast, forcePart, midfunc)
	local partmul = self:_getPartMultiplier(forcePart)		local partmul = self:_getPartMultiplier(forcePart)
	local damage = ~~apex.calcDamageFromPartAndPassive~~(base, partmul, passive, self.opts)		local damage = calcDamage(base, partmul, passive, self.opts, midfunc)
	local hasBeam = self.beamdamage > 0 and self.beamticks > 0		local hasBeam = self.beamdamage > 0 and self.beamticks > 0
	local beamdamage		local beamdamage
88行目:		103行目:

	partmul = self:_getPartMultiplier(forcePart)		partmul = self:_getPartMultiplier(forcePart)
	damage = ~~apex.calcDamageFromPartAndPassive~~(base, partmul, passive, self.opts)		damage = calcDamage(base, partmul, passive, self.opts, midfunc)
	if hasBeam then		if hasBeam then
	beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)		beamdamage = apex.calcDamageFromPartAndPassive(self.beamdamage, partmul, passive, self.opts)
153行目:		168行目:
	self.patternIndex = 1 -- 強制的に first パターンに戻す		self.patternIndex = 1 -- 強制的に first パターンに戻す
	end		end

			-- ディスラプター弾
			if self.disruptorRounds > 1 then
			-- シールド
			local midfunc = function(damage)
			return apex.calcDisruptorDamage(damage, self.disruptorRounds)
			end
			shield = self:_calcShotToKill(self.damage, passive, shield, isGreaterThanOrEqualToDamage, false, nil, midfunc)

			-- シールドと体力の混合
			while shield > 0 do
			local mul = self:_getPartMultiplier(apex.BODY)
			if mul > 0 then
			local partDamage = apex.calcPartDamage(self.damage, mul)
			local minDamage = apex.calcPassiveDamage(partDamage, passive, self.opts)
			local maxDamage = apex.calcPassiveDamage(apex.calcDisruptorDamage(partDamage, self.disruptorRounds), passive, self.opts)
			local mergedDamage = aw.clamp(maxDamage, minDamage, math.max(minDamage, shield))
			health = health - (mergedDamage - shield)
			shield = 0
			self:_saveState(mergedDamage)
			else
			self:_saveState(0)
			end
			end

			-- 体力
			health = self:_calcShotToKill(self.damage, passive, health, isEqualToZero, true)

	-- ハンマーポイント弾		-- ハンマーポイント弾
	if self.hammerpointRounds > 1 then		elseif self.hammerpointRounds > 1 then
	-- シールド		-- シールド
	shield = self:_calcShotToKill(self.damage, passive, shield, isGreaterThanOrEqualToDamage)		shield = self:_calcShotToKill(self.damage, passive, shield, isGreaterThanOrEqualToDamage)
165行目:		207行目:
	local baseMergedDamage		local baseMergedDamage
	if shield < self.damage then		if shield < self.damage then
	baseMergedDamage = shield + ~~math~~.floor(self.hammerpointRounds * (self.damage - shield))		baseMergedDamage = shield + apex.calcHammerpointDamage(self.damage - shield, self.hammerpointRounds)
	else		else
	baseMergedDamage = self.damage		baseMergedDamage = self.damage
180行目:		222行目:

	-- 体力		-- 体力
	~~health~~ = ~~self:_calcShotToKill(math~~.~~floor~~(self.hammerpointRounds * self.~~damage~~), passive, health, isEqualToZero, true)		local hammerpointDamage = apex.calcHammerpointDamage(self.damage, self.hammerpointRounds)
			health = self:_calcShotToKill(hammerpointDamage, passive, health, isEqualToZero, true)

	-- ボディーシールド		-- ボディーシールド
230行目:		273行目:
	beamdamage = opts.beamdamage or 0,		beamdamage = opts.beamdamage or 0,
	beamticks = opts.beamticks or 0,		beamticks = opts.beamticks or 0,
			disruptorRounds = opts.disruptorRounds or 0,
	hammerpointRounds = opts.hammerpointRounds or 0,		hammerpointRounds = opts.hammerpointRounds or 0,
	gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false,		gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false,
281行目:		325行目:
	beamdamage = beamdamage,		beamdamage = beamdamage,
	beamticks = beamticks,		beamticks = beamticks,
			disruptorRounds = opts.useDisruptorRounds and damagestat.disruptor_rounds or 0,
	hammerpointRounds = opts.useHammerpointRounds and damagestat.hammerpoint_rounds or 0,		hammerpointRounds = opts.useHammerpointRounds and damagestat.hammerpoint_rounds or 0,
	})		})
289行目:		334行目:
	opts.ampedCover = opts.ampedCover or false		opts.ampedCover = opts.ampedCover or false
	opts.bodyshot = part or opts.bodyshot or 1		opts.bodyshot = part or opts.bodyshot or 1
			opts.disruptorRounds = opts.disruptorRounds or 0
	opts.hammerpointRounds = opts.hammerpointRounds or 0		opts.hammerpointRounds = opts.hammerpointRounds or 0
	opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false		opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false

Mntone: calcShotCountのガンシールド貫通状態に変更に対応

2021-03-16T02:10:37Z

calcShotCountのガンシールド貫通状態に変更に対応

← 古い版		2021年3月16日 (火) 11:10時点における版
287行目:		287行目:
	function apex.calcShotCount(base, part, passive, health, shield, gunshield, opts)		function apex.calcShotCount(base, part, passive, health, shield, gunshield, opts)
	opts = opts or {}		opts = opts or {}
	opts.ampedCover = opts.ampedCover or false		opts.ampedCover = opts.ampedCover or false
	opts.bodyshot = part or opts.bodyshot or 1		opts.bodyshot = part or opts.bodyshot or 1
	opts.hammerpointRounds = opts.hammerpointRounds or 0		opts.hammerpointRounds = opts.hammerpointRounds or 0
	opts.pellets = opts.pellets or 1		opts.gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false
	opts.round = opts.round or false		opts.pellets = opts.pellets or 1
			opts.round = opts.round or false

	local stkc = STKCalculator.new(base, opts)		local stkc = STKCalculator.new(base, opts)

Mntone: ガンシールド貫通のデフォルトパラメーターがfalseになっていた問題の修正

2021-03-16T02:06:39Z

ガンシールド貫通のデフォルトパラメーターがfalseになっていた問題の修正

← 古い版		2021年3月16日 (火) 11:06時点における版
231行目:		231行目:
	beamticks = opts.beamticks or 0,		beamticks = opts.beamticks or 0,
	hammerpointRounds = opts.hammerpointRounds or 0,		hammerpointRounds = opts.hammerpointRounds or 0,
	gunshieldBleedthrough = opts.gunshieldBleedthrough ~~or true~~,		gunshieldBleedthrough = opts.gunshieldBleedthrough ~= false,
	opts = {		opts = {
	ampedCover = opts.ampedCover or false,		ampedCover = opts.ampedCover or false,