add deaths goal type

Author: stringhandler

src-tauri/src/database.rs

@@ -43,6 +43,7 @@ pub fn get_db_dir() -> Option<&'static PathBuf> {
 pub enum GoalMetric {
     Networth,
     Kills,
+    Deaths,
     LastHits,
     Denies,
     Level,
@@ -55,6 +56,7 @@ impl GoalMetric {
         match self {
             GoalMetric::Networth => "networth",
             GoalMetric::Kills => "kills",
+            GoalMetric::Deaths => "deaths",
             GoalMetric::LastHits => "last_hits",
             GoalMetric::Denies => "denies",
             GoalMetric::Level => "level",
@@ -67,6 +69,7 @@ impl GoalMetric {
         match s {
             "networth" => Some(GoalMetric::Networth),
             "kills" => Some(GoalMetric::Kills),
+            "deaths" => Some(GoalMetric::Deaths),
             "last_hits" => Some(GoalMetric::LastHits),
             "denies" => Some(GoalMetric::Denies),
             "level" => Some(GoalMetric::Level),
@@ -1034,6 +1037,15 @@ pub fn evaluate_goal(conn: &Connection, goal: &Goal, match_data: &Match) -> Opti
                 ((match_data.kills as f32 / duration_minutes as f32) * target_minutes as f32) as i32
             }
         }
+        GoalMetric::Deaths => {
+            // For deaths, assume linear progression (same as kills)
+            if duration_minutes <= target_minutes {
+                match_data.deaths
+            } else {
+                // Estimate deaths at target time
+                ((match_data.deaths as f32 / duration_minutes as f32) * target_minutes as f32) as i32
+            }
+        }
         GoalMetric::LastHits => {
             // ONLY use exact per-minute CS data from OpenDota - never estimate
             // Linear estimation (total_cs / game_time * target_time) is completely inaccurate
@@ -1101,10 +1113,8 @@ pub fn evaluate_goal(conn: &Connection, goal: &Goal, match_data: &Match) -> Opti
     };
 
     let achieved = match &goal.metric {
-        GoalMetric::ItemTiming => {
-            // For item timing, actual_value is purchase time in seconds
-            // target_value is target time in seconds
-            // Achieved if purchased before or at target time
+        GoalMetric::ItemTiming | GoalMetric::Deaths => {
+            // Lower is better: achieved if actual <= target
             actual_value <= goal.target_value
         }
         _ => {
@@ -1573,6 +1583,13 @@ pub fn get_goal_match_data(conn: &Connection, goal_id: i64) -> Result<Vec<MatchD
                     ((match_data.kills as f32 / duration_minutes as f32) * target_minutes as f32) as i32
                 }
             }
+            GoalMetric::Deaths => {
+                if duration_minutes <= target_minutes {
+                    match_data.deaths
+                } else {
+                    ((match_data.deaths as f32 / duration_minutes as f32) * target_minutes as f32) as i32
+                }
+            }
             GoalMetric::LastHits => {
                 match cs_map.get(&match_data.match_id) {
                     Some(&(lh, _)) => lh,
@@ -1611,7 +1628,7 @@ pub fn get_goal_match_data(conn: &Connection, goal_id: i64) -> Result<Vec<MatchD
         };
 
         let achieved = match &goal.metric {
-            GoalMetric::ItemTiming => actual_value <= goal.target_value,
+            GoalMetric::ItemTiming | GoalMetric::Deaths => actual_value <= goal.target_value,
             _ => actual_value >= goal.target_value,
         };
 

src/lib/locales/en.json

@@ -203,6 +203,7 @@
     "metric_partner_nw": "Partner Networth",
     "metric_networth": "Net Worth",
     "metric_kills": "Kills",
+    "metric_deaths": "Deaths",
     "metric_level": "Level",
     "metric_item_timing": "Item Timing",
     "item": "Item",
@@ -232,6 +233,7 @@
     "tag_deny": "Deny Goal",
     "tag_item": "Item Goal",
     "tag_kill": "Kill Goal",
+    "tag_death": "Death Goal",
     "tag_nw": "NW Goal",
     "tag_support": "Support Goal",
     "any_hero": "Any Hero",

src/lib/locales/ru.json

@@ -203,6 +203,7 @@
     "metric_partner_nw": "Золото партнёра",
     "metric_networth": "Нетфорс",
     "metric_kills": "Убийства",
+    "metric_deaths": "Смерти",
     "metric_level": "Уровень",
     "metric_item_timing": "Тайминг предмета",
     "item": "Предмет",
@@ -232,6 +233,7 @@
     "tag_deny": "Цель: денаи",
     "tag_item": "Цель: предмет",
     "tag_kill": "Цель: убийства",
+    "tag_death": "Цель: смерти",
     "tag_nw": "Цель: золото",
     "tag_support": "Цель: саппорт",
     "any_hero": "Любой герой",

src/routes/goals/+page.svelte

@@ -254,6 +254,7 @@
     switch (metric) {
       case "Networth": return "Net Worth";
       case "Kills": return "Kills";
+      case "Deaths": return "Deaths";
       case "LastHits": return "Last Hits";
       case "Denies": return "Denies";
       case "Level": return "Level";
@@ -268,6 +269,7 @@
     switch (metric) {
       case "Networth": return "gold";
       case "Kills": return "kills";
+      case "Deaths": return "deaths";
       case "LastHits": return "CS";
       case "Denies": return "denies";
       case "PartnerNetworth": return "gold";
@@ -299,6 +301,8 @@
       const seconds = goal.target_value % 60;
       const timeStr = seconds > 0 ? `${minutes}:${seconds.toString().padStart(2, '0')}` : `${minutes}:00`;
       return `${heroName} — ${itemName} by ${timeStr}`;
+    } else if (goal.metric === "Deaths") {
+      return `${heroName} — at most ${goal.target_value} deaths by ${goal.target_time_minutes} min`;
     } else if (goal.metric === "PartnerNetworth") {
       return `${heroName} — Partner: ${goal.target_value}g by ${goal.target_time_minutes} min`;
     } else {
@@ -328,6 +332,7 @@
       case "Denies": return { tkey: 'goals.tag_deny', cls: 'tag-cs' };
       case "ItemTiming": return { tkey: 'goals.tag_item', cls: 'tag-item' };
       case "Kills": return { tkey: 'goals.tag_kill', cls: 'tag-kill' };
+      case "Deaths": return { tkey: 'goals.tag_death', cls: 'tag-kill' };
       case "Networth": return { tkey: 'goals.tag_nw', cls: 'tag-nw' };
       case "PartnerNetworth": return { tkey: 'goals.tag_support', cls: 'tag-nw' };
       default: return { tkey: null, cls: '' };
@@ -368,6 +373,7 @@
             <option value="PartnerNetworth">{$_('goals.metric_partner_nw')}</option>
             <option value="Networth">{$_('goals.metric_networth')}</option>
             <option value="Kills">{$_('goals.metric_kills')}</option>
+            <option value="Deaths">{$_('goals.metric_deaths')}</option>
             <option value="Level">{$_('goals.metric_level')}</option>
             <option value="ItemTiming">{$_('goals.metric_item_timing')}</option>
           </select>
@@ -395,7 +401,7 @@
           <div class="fg">
             <div class="form-label">{$_('goals.target', { values: { metric: getMetricLabel(formMetric) } })}</div>
             <input class="form-input" type="number" min="1"
-              placeholder={formMetric === "Level" ? "e.g. 6" : "e.g. 50"}
+              placeholder={formMetric === "Level" ? "e.g. 6" : formMetric === "Deaths" ? "e.g. <4" : "e.g. 50"}
               bind:value={formTargetValue} />
           </div>
           <div class="fg fg-narrow">