Merge pull request #1 from edipo2s/develop

Develop
edipo2s · May 15, 2017 · 3ad0883 · 3ad0883
2 parents 8faba17 + 4428eab
commit 3ad0883
Show file tree

Hide file tree

Showing 104 changed files with 1,704 additions and 1,078 deletions.
diff --git a/.idea/modules/WabbaTrack.iml b/.idea/modules/WabbaTrack.iml
diff --git a/build.gradle b/build.gradle
@@ -51,5 +51,5 @@ dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'com.google.truth', name: 'truth', version: '0.31'
+    testCompile group: 'com.google.truth', name: 'truth', version: '0.32'
 }
diff --git a/pHashCalc/src/kotlin/com/ediposouza/CalcPHashs.kt b/pHashCalc/src/kotlin/com/ediposouza/CalcPHashs.kt
@@ -17,6 +17,7 @@ object CalcPHashs {
 
     val CROP_FOLDER_ARENA = "Arena"
     val CROP_FOLDER_CARDS = "Cards"
+    val CROP_FOLDER_DECK = "Deck"
     val CROP_FOLDER_GAME = "Game"
     val CROP_FOLDER_SCREENS = "Screens"
 
@@ -32,10 +33,13 @@ object CalcPHashs {
         getDHashFile("/Screens/MainModePratice.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenMainModeCrop)
         getDHashFile("/Screens/MainModePratice2.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenMainModeCrop)
         getDHashFile("/Screens/Game.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenGameCrop)
-        getDHashFile("/Game/CardGenerated.png", CROP_FOLDER_GAME, BufferedImage::getGameCardGenerateCrop)
         getDHashFile("/Screens/ArenaClasses.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenArenaClassesCrop)
         getDHashFile("/Screens/ArenaPicks.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenArenaPicksCrop)
         getDHashFile("/Screens/ArenaDash.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenArenaDashboardCrop)
+        getDHashFile("/Screens/DeckBuilder.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenDeckBuilderCrop)
+        getDHashFile("/Screens/DeckBuilderEmpty.png", CROP_FOLDER_SCREENS, BufferedImage::getScreenDeckBuilderEmptyCrop)
+        getDHashFile("/Deck/CollectionEmpty.png", CROP_FOLDER_DECK) { it.getDeckBuilderFirstLineCardCrop(1) }
+        getDHashFile("/Deck/DeckBuilderNoneLeft.png", CROP_FOLDER_DECK) { it.getDeckBuilderNoneLeftCardCrop(2) }
 
         Logger.d("--Arena Class Select--")
         getDHashFolderFiles("/ArenaClass", CROP_FOLDER_ARENA, BufferedImage::getArenaPickClassCrop)
@@ -47,6 +51,7 @@ object CalcPHashs {
         getDHashFile("/Game/Win2.png", CROP_FOLDER_GAME, BufferedImage::getGameWin2Crop)
         getDHashFile("/Game/Loss.png", CROP_FOLDER_GAME, BufferedImage::getGameLossCrop)
         getDHashFile("/Game/Loss2.png", CROP_FOLDER_GAME, BufferedImage::getGameLoss2Crop)
+        getDHashFile("/Game/CardGenerated.png", CROP_FOLDER_GAME, BufferedImage::getGameCardGenerateCrop)
         getDHashFolderFiles("/Game/PlayerRank", CROP_FOLDER_GAME, BufferedImage::getGameOpponentRankCrop)
         getDHashFolderFiles("/Game/PlayerClass", CROP_FOLDER_GAME, BufferedImage::getGamePlayerClassCrop)
         getDHashFolderFiles("/Game/OpponentClass", CROP_FOLDER_GAME, BufferedImage::getGameOpponentClassCrop)

diff --git a/pHashCalc/src/resources/Cards/Core/Strength/reiveblademaster.png b/pHashCalc/src/resources/Cards/Core/Strength/reiveblademaster.png
diff --git a/...hCalc/src/resources/Cards/Fallofthedarkbrotherhood/Willpower/theblackdragon.png b/...hCalc/src/resources/Cards/Fallofthedarkbrotherhood/Willpower/theblackdragon.png
diff --git a/pHashCalc/src/resources/CardsChanged/theblackdragon.png b/pHashCalc/src/resources/CardsChanged/theblackdragon.png
diff --git a/pHashCalc/src/resources/Deck/CollectionEmpty.png b/pHashCalc/src/resources/Deck/CollectionEmpty.png
diff --git a/pHashCalc/src/resources/Deck/CollectionRarity.png b/pHashCalc/src/resources/Deck/CollectionRarity.png
diff --git a/pHashCalc/src/resources/Deck/CollectionSets.png b/pHashCalc/src/resources/Deck/CollectionSets.png
diff --git a/pHashCalc/src/resources/Deck/DeckBuilderNoneLeft.png b/pHashCalc/src/resources/Deck/DeckBuilderNoneLeft.png
diff --git a/pHashCalc/src/resources/Deck/ArcherPart2.png → pHashCalc/src/resources/Deck/DeckListEnd.png b/pHashCalc/src/resources/Deck/ArcherPart2.png → pHashCalc/src/resources/Deck/DeckListEnd.png
diff --git a/pHashCalc/src/resources/Deck/ArcherPart1.png → ...Calc/src/resources/Deck/DeckListStart.png b/pHashCalc/src/resources/Deck/ArcherPart1.png → ...Calc/src/resources/Deck/DeckListStart.png
diff --git a/pHashCalc/src/resources/Deck/DeckName.png b/pHashCalc/src/resources/Deck/DeckName.png
diff --git a/pHashCalc/src/resources/Screens/DeckBuilder.png b/pHashCalc/src/resources/Screens/DeckBuilder.png
diff --git a/pHashCalc/src/resources/Screens/DeckBuilderEmpty.png b/pHashCalc/src/resources/Screens/DeckBuilderEmpty.png