Correspondence with limited increment lichess-org#4462

Author: ddugovic

core/src/main/scala/CorrespondenceClock.scala

@@ -6,6 +6,7 @@ import java.time.Instant
 
 // times are expressed in seconds
 case class CorrespondenceClock(
+    base: Int,
     increment: Int,
     whiteTime: Float,
     blackTime: Float
@@ -27,19 +28,29 @@ case class CorrespondenceClock(
     )
 
   // in seconds
-  def estimateTotalTime: Int = increment * 40 / 2
+  def estimateTotalTime: Int = base + increment * 40 / 2
 
   def incrementHours: Int = increment / 60 / 60
 
 object CorrespondenceClock:
   val hourSeconds = 60 * 60
   val daySeconds  = 24 * hourSeconds
 
-  def apply(daysPerTurn: Int, turnColor: Color, lastMoveAt: Instant): CorrespondenceClock =
-    val increment   = daysPerTurn * 24 * 60 * 60
+  // TODO: specify which color to add days to, if allowing addition to either color
+  def apply(
+      base: Int,
+      increment: Int,
+      remainingTime: Float,
+      daysToAdd: Int,
+      turnColor: Color,
+      lastMoveAt: Instant
+  ): CorrespondenceClock =
+    val limit       = base
+    val incremented = (remainingTime + (daysToAdd * daySeconds)).max(limit * daySeconds).toInt.max(0)
     val secondsLeft = (lastMoveAt.toSeconds + increment - nowSeconds).toInt.max(0)
     CorrespondenceClock(
+      base = base,
       increment = increment,
-      whiteTime = turnColor.fold(secondsLeft, increment).toFloat,
-      blackTime = turnColor.fold(increment, secondsLeft).toFloat
+      whiteTime = turnColor.fold(secondsLeft, incremented).toFloat,
+      blackTime = turnColor.fold(incremented, secondsLeft).toFloat
     )