Fix overflow

build.rs

@@ -43,6 +43,7 @@ fn main() {
         } = skill;
         let hits = quote_option(hits);
         let expected = quote_option(expected);
+        let max_duration = quote_option(max_duration);
         quote! {
             SkillDef {
                 id: #id,

src/data/structs.rs

@@ -4,6 +4,9 @@ use serde::{Deserialize, Serialize};
 // TODO: instead of hits allow counting buff apply?
 // TODO: support instant casts with buff apply?
 
+/// Extra error margin for max duration.
+const DURATION_EPSILON: i32 = 500;
+
 /// Skill information.
 #[derive(Debug, Clone)]
 pub struct SkillInfo {
@@ -37,7 +40,9 @@ impl From<SkillDef> for SkillInfo {
                 max,
                 expected: expected.unwrap_or((max + 1) / 2),
             }),
-            max_duration,
+            max_duration: max_duration
+                .map(|dur| dur + DURATION_EPSILON)
+                .unwrap_or(i32::MAX),
             minion,
         }
     }
@@ -74,18 +79,13 @@ pub struct SkillDef {
     pub expected: Option<usize>,
 
     /// Maximum duration (ms) to count as one cast.
-    #[serde(default = "default_as_max")]
-    pub max_duration: i32,
+    pub max_duration: Option<i32>,
 
     /// Whether to include minion hits.
     #[serde(default)]
     pub minion: bool,
 }
 
-const fn default_as_true() -> bool {
+fn default_as_true() -> bool {
     true
 }
-
-const fn default_as_max() -> i32 {
-    i32::MAX
-}

src/plugin/event.rs

@@ -8,9 +8,6 @@ use crate::combat::{
 use arcdps::{evtc::EventKind, Activation, Agent, CombatEvent, StateChange, Strike};
 use log::debug;
 
-/// Extra error margin for max duration.
-const DURATION_EPSILON: i32 = 500;
-
 impl Plugin {
     /// Handles a combat event from area stats.
     pub fn area_event(
@@ -205,7 +202,7 @@ impl Plugin {
                 // replace skill id
                 skill.id = info.id;
 
-                let max = info.max_duration + DURATION_EPSILON;
+                let max = info.max_duration;
                 match self.latest_cast_mut(skill.id) {
                     Some(cast) if time - cast.time <= max => {
                         cast.hit(target);