Module:CalcCombat - Revision history

Botkaze: 8 revisions imported

2021-05-12T12:47:10Z

8 revisions imported

がか: がか moved page Module:Combat2 to Module:CalcCombat

2020-06-24T07:14:34Z

がか moved page Module:Combat2 to Module:CalcCombat

がか at 18:53, 9 November 2017

2017-11-09T18:53:17Z

がか at 18:39, 7 November 2017

2017-11-07T18:39:46Z

がか at 18:34, 7 November 2017

2017-11-07T18:34:02Z

がか at 13:52, 7 November 2017

2017-11-07T13:52:39Z

がか at 13:30, 7 November 2017

2017-11-07T13:30:16Z

がか at 13:21, 7 November 2017

2017-11-07T13:21:59Z

がか: Created page with " local Combat2 = {} local sqrt = math.sqrt local floor = math.floor local min = math.min local max = math.max function morale_modifier(morale) return not morale and 1 or..."

2017-11-05T10:26:29Z

Created page with " local Combat2 = {} local sqrt = math.sqrt local floor = math.floor local min = math.min local max = math.max function morale_modifier(morale) return not morale and 1 or..."

New page

local Combat2 = {}

local sqrt = math.sqrt
local floor = math.floor
local min = math.min
local max = math.max

function morale_modifier(morale)
return not morale and 1 or morale <= 20 and 0.5 or morale <= 32 and 0.8 or morale <= 52 and 1 or 1.2
end

function target_morale_modifier(morale)
return not morale and 1 or morale <= 20 and 1.4 or morale <= 32 and 1.2 or morale <= 52 and 1 or 0.7
end

-- Calculate shelling hit (normal and critical) rate.
-- ship and target can be Ship, EnemyShip, ShipCapabilities, etc.
-- [[Category:Todo]]: ignoring equipment, type and fuel modifiers.
function Combat2.hit_rate(ship, target, context)

ship = ship and ship.ship or ship
target = target and target.ship or target
context = context or {}
if not ship or not target then
return
end

local level = ship:level() or 1
local luck = ship:luck() or 0
local accuracy = ship:accuracy() or 0
local morale = morale_modifier(ship:morale())
local formation = context._formation or ship._formation or 1

local accuracy_value = floor((90 + 2 * sqrt(level) + sqrt(1.5 * luck) + accuracy) * morale * formation)

local evasion = target:evasion() or 0
local target_luck = target:luck() or 0
local target_formation = context._target_formation or target._formation or 1
local target_morale = target_morale_modifier(target:morale())

local base_evasion_value = floor((evasion + sqrt(2 * target_luck)) * target_formation)

local capped_evasion_value
= base_evasion_value < 40
and base_evasion_value
or base_evasion_value < 65
and floor(40 + 3 * sqrt(base_evasion_value - 40))
or floor(55 + 2 * sqrt(base_evasion_value - 65))

local evasion_value = capped_evasion_value

local base_hit_rate = accuracy_value - evasion_value

local capped_hit_rate = min(96, max(10, base_hit_rate) * target_morale)

return capped_hit_rate + 1

end

function Combat2.test()
local Ship = require("Module:Ship")
mw.log(Combat2.hit_rate(Ship("Nagato/Kai Ni"){ _level = 99, _accuracy = 10, _morale = 25 }, Ship("Destroyer Ro-Class")))
end

return Combat2

@@ Line 3: / Line 3: @@
 local sqrt = math.sqrt
 local floor = math.floor
 local min = math.min
 local max = math.max
 function target_morale_modifier(morale)
      return not morale and 1 or morale <= 20 and 1.4 or morale <= 32 and 1.2 or morale <= 52 and 1 or 0.7
 end
@@ Line 19: / Line 40: @@
 function Combat2.accuracy_value(ship, target, context)
-     ship = ship and ship.ship or ship
+     ship, target, context = initArgs(ship, target, context)
      local level = ship._level or 1
      local luck = ship._luck or 0
@@ Line 43: / Line 59: @@
 -- [[Category:Todo]]: detection based on _equipment, fuel modifier.
 function Combat2.hit_rate(ship, target, context)
+     ship, target, context = initArgs(ship, target, context)
      local _, _, accuracy_value = Combat2.accuracy_value(ship, target, context)
-    accuracy_value = floor(accuracy_value)
+     local evasion_value = Combat2.evasion_value(target, context)
+     local base_hit_rate = floor(accuracy_value) - evasion_value
      local target_morale = target_morale_modifier(target._morale)
      local capped_hit_rate = min(96, max(10, base_hit_rate) * target_morale)
      local proficiency = ship._proficiency or 0
      return floor(capped_hit_rate) + proficiency + 1, capped_hit_rate
 end
@@ Line 85: / Line 74: @@
      local proficiency = ship._proficiency or 0
      return floor(1.3 * sqrt(capped_hit_rate)) + proficiency + 1
 end
@@ Line 95: / Line 113: @@
          _accuracy = 10,
          _morale = 25,
-         _fit = 5 * sqrt(2)
+         _fit = 5 * sqrt(2),
+     }
      local target = Ship("Destroyer Ro-Class")
-     mw.log(Combat2.accuracy_value(ship, target))
+     --mw.log(Combat2.accuracy_value(ship, target))
-     mw.log(Combat2.hit_rate(ship, target), "")
+     --mw.log(Combat2.hit_rate(ship, target), "")
-     mw.log(Combat2.critical_hit_rate(ship, target))
+     --mw.log(Combat2.critical_hit_rate(ship, target))
 end
 return Combat2

← Older revision		Revision as of 18:39, 7 November 2017
Line 52:		Line 52:

	local _, _, accuracy_value = Combat2.accuracy_value(ship, target, context)		local _, _, accuracy_value = Combat2.accuracy_value(ship, target, context)
		+	accuracy_value = floor(accuracy_value)

	local evasion = target._evasion or 0		local evasion = target._evasion or 0

@@ Line 18: / Line 18: @@
 end
--- Shelling hit rate.
+function Combat2.accuracy_value(ship, target, context)
      ship = ship and ship.ship or ship
      target = target and target.ship or target
@@ Line 29: / Line 25: @@
          return
      end
      local level = ship._level or 1
      local luck = ship._luck or 0
@@ Line 38: / Line 33: @@
      local morale = morale_modifier(ship._morale)
      local formation = context._formation or ship._formation or 1
-     local accuracy_value = floor(((90 + 2 * sqrt(level) + sqrt(1.5 * luck) + accuracy) * morale * formation + fit) * as_modifier * ap_modifier)
+     local _, _, accuracy_value = Combat2.accuracy_value(ship, target, context)
      local evasion = target._evasion or 0
@@ Line 85: / Line 97: @@
+     }
      local target = Ship("Destroyer Ro-Class")
-     mw.log(Combat2.hit_rate(ship, target))
+    mw.log(Combat2.accuracy_value(ship, target))
      mw.log(Combat2.critical_hit_rate(ship, target))
 end
 return Combat2

@@ Line 18: / Line 18: @@
 -- ship and target can be Ship, EnemyShip, ShipCapabilities, etc.
 -- [[Category:Todo]]:
--- * ignoring equipment, type and fuel modifiers
+-- * ignoring _equipment, no fuel modifier
 -- * also use _fields instead of getter functions? then any record will do for ship and target
 function Combat2.hit_rate(ship, target, context)

← Older revision	Revision as of 12:47, 12 May 2021
(No difference)

@@ Line 1: / Line 1: @@
 local Combat2 = {}
@@ Line 6: / Line 5: @@
 local min = math.min
 local max = math.max
 function morale_modifier(morale)
@@ Line 11: / Line 18: @@
 end
-function target_morale_modifier(morale)
+-- Shelling hit rate.
-    return not morale and 1 or morale <= 20 and 1.4 or morale <= 32 and 1.2 or morale <= 52 and 1 or 0.7
+-- ship and target can be Ship, EnemyShip, ShipCapabilities, or a plain table.
-end
+-- [[Category:Todo]]: detection based on _equipment, fuel modifier.
      ship = ship and ship.ship or ship
      target = target and target.ship or target
@@ Line 29: / Line 30: @@
      end
-     local level = ship:level() or 1
+     local level = ship._level or 1
-     local luck = ship:luck() or 0
+     local luck = ship._luck or 0
-     local accuracy = ship:accuracy() or 0
+     local accuracy = ship._accuracy or 0
      local fit = ship._fit or 0
      local as_modifier = ship._as_modifier or 1
      local ap_modifier = ship._ap_modifier or 1
-     local morale = morale_modifier(ship:morale())
+     local morale = morale_modifier(ship._morale)
      local formation = context._formation or ship._formation or 1
      local accuracy_value = floor(((90 + 2 * sqrt(level) + sqrt(1.5 * luck) + accuracy) * morale * formation + fit) * as_modifier * ap_modifier)
-     local evasion = target:evasion() or 0
+     local evasion = target._evasion or 0
-     local target_luck = target:luck() or 0
+     local target_luck = target._luck or 0
      local target_formation = context._target_formation or target._formation or 1
-     local target_morale = target_morale_modifier(target:morale())
+     local target_morale = target_morale_modifier(target._morale)
      local base_evasion_value = floor((evasion + sqrt(2 * target_luck)) * target_formation)
@@ Line 59: / Line 60: @@
      local capped_hit_rate = min(96, max(10, base_hit_rate) * target_morale)
 end
 function Combat2.test()
      local Ship = require("Module:Ship")
-     mw.log(Combat2.hit_rate(Ship("Nagato/Kai Ni"){ _level = 99, _accuracy = 10, _morale = 25 }, Ship("Destroyer Ro-Class")))
+     local ship = Ship("Nagato/Kai Ni"){
 end
 return Combat2