Module:Scaling - Revision history

Ibanix at 10:06, 8 March 2016

2016-03-08T10:06:18Z

2016-03-08T10:02:13Z

2016-03-08T09:54:30Z

2016-03-08T09:41:28Z

2016-03-08T09:38:53Z

2016-03-06T06:06:12Z

2016-03-06T05:44:41Z

2016-03-06T05:35:10Z

2016-03-06T05:27:31Z

2016-03-06T05:23:56Z

@@ Line 224: / Line 224: @@
 	local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
 	-- Compute real
-	return  ( (base + (spellpower)) * ((math.sqrt(t) - 1) * 0.8 + 1) * mod )^1.04
+	return  scale._rescaleDamage( (base + (spellpower)) * ((math.sqrt(t) - 1) * 0.8 + 1) * mod )
 end
@@ Line 244: / Line 244: @@
 	local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
 	-- Compute real
-	return ( (base + (mindpower)) * ((math.sqrt(t) - 1) * 0.8 + 1) * mod )^1.04
+	return scale._rescaleDamage( (base + (mindpower)) * ((math.sqrt(t) - 1) * 0.8 + 1) * mod )
 end
@@ Line 285: / Line 285: @@
 	local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
 	-- Compute real
-	return scale.rescaleDamage( (base + (pwr * ((math.sqrt(t) - 1) * 0.8 + 1) * mod) ) )
+	return scale._rescaleDamage( (base + (pwr * ((math.sqrt(t) - 1) * 0.8 + 1) * mod) ) )
-−
-end
-−
--- Scale damage values
--- This currently beefs up high-end damage values to make up for the combat stat rescale nerf
--- dam = input damage
-function scale.rescaleDamage(dam)
-−
-       -- local new_args = scale._getParameters( frame.args, { 'dam' } );
-       -- local dam = tonumber( new_args['dam'] );
-        return dam ^ 1.04
 end
@@ Line 317: / Line 306: @@
 end

@@ Line 292: / Line 292: @@
 -- This currently beefs up high-end damage values to make up for the combat stat rescale nerf
 -- dam = input damage
-function scale.rescaleDamage(frame)
+function scale.rescaleDamage(dam)
-        local new_args = scale._getParameters( frame.args, { 'dam' } );
+       -- local new_args = scale._getParameters( frame.args, { 'dam' } );
-        local dam = tonumber( new_args['dam'] );
+       -- local dam = tonumber( new_args['dam'] );
          return dam ^ 1.04

@@ Line 265: / Line 265: @@
 	local mult = base + diff * math.sqrt((t + t2) / 5)
 	return mult
 end

@@ Line 278: / Line 278: @@
 	local pm = math.sqrt(paradox / 300)
 	if paradox < 300 then pm = paradox/300 end
-	pm = util.bound(pm, 0.5, 1.5)
+        if pm < 0.5 then pm = 0.5 end
 	return pm

← Older revision		Revision as of 09:38, 8 March 2016
Line 266:		Line 266:
	return mult		return mult
	end		end
		+
		+
		+	-- Paradox modifier. This dictates paradox cost and spellpower scaling.
		+	-- Note that 300 is the optimal balance
		+	-- Caps at -50% and +50%
		+
		+	function scale.getParadoxModifier(frame)
		+
		+	local new_args = scale._getParameters( frame.args, { 'paradox' } );
		+	local paradox = tonumber( new_args['paradox'] );
		+	local pm = math.sqrt(paradox / 300)
		+	if paradox < 300 then pm = paradox/300 end
		+	pm = util.bound(pm, 0.5, 1.5)
		+	return pm
		+
		+	end
		+
		+

@@ Line 225: / Line 225: @@
 	-- Compute real
 	return  ( (base + (spellpower)) * ((math.sqrt(t) - 1) * 0.8 + 1) * mod )^1.04
 end
@@ Line 232: / Line 252: @@
 -- base = base value
 -- max = value at  talent level = 5
--- t2 = adds directly to talent level
+-- t2 = add value to talent; is effectively adding t2/2 to t
 function scale.combatTalentWeaponDamage(frame)
@@ Line 246: / Line 266: @@
 	return mult
 end
 --[[

@@ Line 223: / Line 223: @@
 	local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
 	-- Compute real
-	return  ( (base + (spellpower_override or spellpower)) * (math.sqrt(t - 1) * 0.8 + 1) * mod )^1.04
+	return  ( (base + (spellpower)) * (math.sqrt(t - 1) * 0.8 + 1) * mod )^1.04
 end

← Older revision		Revision as of 05:23, 6 March 2016
Line 206:		Line 206:
	end		end

		+	-- Gets damage based on talent, spellpower
		+	-- t = talent level
		+	-- base = base value
		+	-- max = value at spellpower=100, talent level = 5
		+	-- sp_ovr = spellpower override function (PM = paradox; CF = cursed form)
		+	function scale.combatTalentSpellDamage(frame)
		+
		+	local new_args = scale._getParameters( frame.args, { 't', 'base', 'max', 'spellpower', 'sp_ovr' } );
		+	local t = tonumber( new_args['t'] );
		+	local base = tonumber( new_args['base'] );
		+	local max = tonumber( new_args['max'] );
		+	local spellpower = tonumber( new_args['spellpower'] );
		+	local spellpower_override = 0; -- new_args['sp_ovr'];
		+
		+	-- Compute at "max"
		+	local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
		+	-- Compute real
		+	return ( (base + (spellpower_override or spellpower)) * (math.sqrt(t - 1) * 0.8 + 1) * mod )^1.04
		+	end

	--[[		--[[