From c0830688acab0bea57a4aa4884809809488395e8 Mon Sep 17 00:00:00 2001 From: waicool20 Date: Thu, 26 Jul 2018 01:05:30 +0800 Subject: [PATCH] Fix stats reporting due to new stats format --- .../com/waicool20/kaga/kcauto/KCAutoStats.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/waicool20/kaga/kcauto/KCAutoStats.kt b/src/main/kotlin/com/waicool20/kaga/kcauto/KCAutoStats.kt index c54927e..8f18d2f 100644 --- a/src/main/kotlin/com/waicool20/kaga/kcauto/KCAutoStats.kt +++ b/src/main/kotlin/com/waicool20/kaga/kcauto/KCAutoStats.kt @@ -66,12 +66,16 @@ object KCAutoStatsTracker { currentStats().pvpsDone = it.groupValues[1].toInt() } - // Track buckets used - subscribe(Regex(".*Resupplies: $stat \\|\\| Repairs: $stat \\|\\| Buckets: $stat.*")) { + // Track resupplies + subscribe(Regex(".*Resupplies: $stat \\|\\| Fairy resupplies: $stat.*")) { + currentStats().resupplies = it.groupValues[1].toInt() + it.groupValues[2].toInt() + } + + // Track repairs and buckets + subscribe(Regex(".*Repairs: $stat \\|\\| Buckets: $stat.*")) { currentStats().apply { - resupplies = it.groupValues[1].toInt() - repairs = it.groupValues[2].toInt() - bucketsUsed = it.groupValues[3].toInt() + repairs = it.groupValues[1].toInt() + bucketsUsed = it.groupValues[2].toInt() } } @@ -86,7 +90,7 @@ object KCAutoStatsTracker { } // Track recoveries - subscribe(Regex(".*Recoveries done: (\\d+).*")) { + subscribe(Regex(".*Recoveries done: $stat.*")) { currentStats().recoveries = it.groupValues[1].toInt() }