Merge pull request #4 from edipo2s/develop

Develop
edipo2s · Jun 8, 2017 · e4389c2 · e4389c2
2 parents 9ec2ebc + 142bf3a
commit e4389c2
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 51 deletions.
diff --git a/.idea/modules/WabbaTrack.iml b/.idea/modules/WabbaTrack.iml
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ group 'com.ediposouza'
 version '0.1'
 
 buildscript {
-    ext.kotlin_version = '1.1.2-2'
+    ext.kotlin_version = '1.1.2-4'
 
     repositories {
         mavenCentral()

diff --git a/pHashCalc/src/resources/Cards/Core/Dual/protectorofthemane.png b/pHashCalc/src/resources/Cards/Core/Dual/protectorofthemane.png
diff --git a/src/main/kotlin/com/ediposouza/TESLTracker.kt b/src/main/kotlin/com/ediposouza/TESLTracker.kt
@@ -64,7 +64,7 @@ class TESLTracker : App(MainStageView::class) {
     companion object {
 
         val APP_NAME = "WabbaTrack"
-        val APP_VERSION = "0.2.2"
+        val APP_VERSION = "0.2.3"
         val DEBUG_FILE_NAME = "WabbaTrack.debug"
         val WABBATRACK_URL = "https://edipo2s.github.io/WabbaTrack/"
 
@@ -163,6 +163,8 @@ class TESLTracker : App(MainStageView::class) {
     private lateinit var trayPopupMenu: PopupMenu
     private lateinit var menuMyDecks: List<Any>
     private lateinit var menuImportedDecks: List<Any>
+    private lateinit var elderScrollDetectionInvalidateJob: Job
+    private var elderScrollDetectionRunning = false
     private val legendsIconStream: InputStream by lazy { TESLTracker::class.java.getResourceAsStream(iconName) }
     private val mainWidget: MainWidget by lazy { MainWidget() }
     private val loggerController by inject<LoggerController>()
@@ -251,7 +253,7 @@ class TESLTracker : App(MainStageView::class) {
             Mixpanel.trackUser()
         }
         launch(CommonPool) {
-            startElderScrollDetection()
+            startGetWindowTitleCheck()
         }
         launch(CommonPool) {
             delay(500)
@@ -615,6 +617,25 @@ class TESLTracker : App(MainStageView::class) {
         }
     }
 
+    suspend private fun startGetWindowTitleCheck() {
+        elderScrollDetectionInvalidateJob = launch(CommonPool) {
+            delay(DELAY_WINDOW_DETECTION * 2)
+            Logger.i("ElderScrollDetection thread stop")
+            elderScrollDetectionRunning = false
+        }
+        while (true) {
+            delay((ELDER_SCROLL_SPS * 1000L).toLong())
+            Logger.i("Checking ElderScrollDetection...")
+            if (!elderScrollDetectionRunning) {
+                Logger.i("Starting ElderScrollDetection thread")
+                elderScrollDetectionRunning = true
+                launch(CommonPool) {
+                    startElderScrollDetection()
+                }
+            }
+        }
+    }
+
     suspend private fun startElderScrollDetection() {
         TESLTrackerData.updateCardDB()
         Logger.d("Using ${referenceConfig.SCREEN_REFERENCE} as reference")
@@ -623,6 +644,8 @@ class TESLTracker : App(MainStageView::class) {
         }
         Logger.i("Waiting Elder scroll legends..")
         while (true) {
+            elderScrollDetectionInvalidateJob.cancel()
+            elderScrollDetectionInvalidateJob.start()
             if (isTESLegendsScreenActive()) {
                 Logger.i("Elder scroll legends detected!")
                 Mixpanel.postEventGameDetected()

diff --git a/src/main/kotlin/com/ediposouza/data/PHashCards.kt b/src/main/kotlin/com/ediposouza/data/PHashCards.kt
@@ -91,6 +91,7 @@ object DHashCards {
             "0110111100010001111111100000011011101010001100111010101111100111011000111001110011101010011001010001100010011100011100101" to "masterofthieves",
             "1000101010100100000000101100101100011111010101110010010011000011001001101111000001011010000110100001101100100000000010111" to "merricataswala",
             "1011011100100110111111111111010011110110000001001001110000001001000000111100111001100101110111010011100101000000000110100" to "militantchieftain",
+            "0101111000100001000011110100001111010111000111010111000110001001100011001100001111110100101101101111100000110110001110010" to "protectorofthemane",
             "1001110000000110000110111100110110110111010111000101101100110001110001000111010010111101000011110001100010111100010010010" to "queenbarenziah",
             "0011011000001101001011111110000101011001000000001001111110101001001110000001001010001101000101010011010100001010100101110" to "redbramman",
             "0100111000100010110000001110001010101110011000011110100010011000010000011010001000111000101000100001000111111010100010110" to "riftthane",

diff --git a/src/main/kotlin/com/ediposouza/state/GameState.kt b/src/main/kotlin/com/ediposouza/state/GameState.kt
@@ -78,6 +78,7 @@ object GameState : StateHandler.TESLState {
         playerGoFirst = null
         playerDeckClass = null
         playerRank = null
+        playerRankLegend = null
         opponentDeckClass = null
         opponentRank = null
         lastCardDraw = null
@@ -313,6 +314,9 @@ object GameState : StateHandler.TESLState {
     fun isDeckTrackerVisible() = deckTracker.isVisible
 
     fun showDeckTracker(forceShow: Boolean = false) {
+        if (forceShow) {
+            deckTracker.resetZoom()
+        }
         if (forceShow || (deckCardsSlot.isNotEmpty() && shouldShowDeckTracker)) {
             deckTracker.isVisible = true
         }

diff --git a/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt b/src/main/kotlin/com/ediposouza/ui/DeckTrackerWidget.kt
@@ -44,8 +44,9 @@ import javax.swing.SwingUtilities
  */
 class DeckTrackerWidget : JFrame() {
 
+    private val DEFAULT_ZOOM = 0.9f
     private val deckCardsSlot: ObservableList<CardSlot> = FXCollections.observableArrayList<CardSlot>()
-    private var deckTrackerZoom: Float = 0.8f.takeIf { GameState.matchMode == MatchMode.ARENA } ?: 0.9f
+    private var deckTrackerZoom: Float = 0.8f.takeIf { GameState.matchMode == MatchMode.ARENA } ?: DEFAULT_ZOOM
     private lateinit var deckTrackerSize: Dimension
 
     var deckName: String? = null
@@ -316,6 +317,10 @@ class DeckTrackerWidget : JFrame() {
         }
     }
 
+    fun resetZoom() {
+        deckTrackerZoom = DEFAULT_ZOOM
+    }
+
     private fun updateDeckCover() {
         val frameCoverStream = TESLTracker::class.java.getResourceAsStream("/UI/frameCover.png")
         val deckClass = DeckClass.getClasses(deckCardsSlot.groupBy { it.card.attr }.keys.toList()).firstOrNull()