Dependency updates

.gitignore

@@ -101,13 +101,6 @@ nb-configuration.xml
 /local.properties
 .gradle/
 gradle-app.setting
-/build/
-/android/build/
-/core/build/
-/desktop/build/
-/html/build/
-/ios/build/
-/ios-moe/build/
 
 ## OS Specific
 .DS_Store

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.3.61'
+    ext.kotlinVersion = '1.3.72'
 
     repositories {
         mavenLocal()
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
@@ -27,7 +27,7 @@ allprojects {
         box2DLightsVersion = '1.4'
         ashleyVersion = '1.7.3'
         aiVersion = '1.8.0'
-        ktxVersion = '1.9.10-b2'
+        ktxVersion = '1.9.10-b6'
     }
 
     repositories {

core/src/me/msoucy/ptures/PTures.kt

@@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import ktx.app.KtxGame
 import ktx.app.KtxScreen
 import ktx.inject.Context
+import ktx.inject.register
 import me.msoucy.ptures.screens.LoadingScreen
 
 class PTures : KtxGame<KtxScreen>() {

core/src/me/msoucy/ptures/controller/Engine.kt

@@ -1,10 +1,11 @@
 package me.msoucy.ptures.controller
 
-import me.msoucy.ptures.model.*
+import me.msoucy.ptures.model.Creature
+import me.msoucy.ptures.model.KnockedOut
 import me.msoucy.ptures.model.Target
+import me.msoucy.ptures.model.Team
 import me.msoucy.ptures.view.BattleView
 import me.msoucy.ptures.view.CreatureView
-import me.msoucy.ptures.model.SkillChoice
 
 sealed class BattleType(vararg val teams: Team) {
     init {

core/src/me/msoucy/ptures/model/Status.kt

@@ -1,7 +1,5 @@
 package me.msoucy.ptures.model
 
-import me.msoucy.ptures.controller.Engine
-
 sealed class Status {
 
     open fun onTurnStart(creature: Creature) {

core/src/me/msoucy/ptures/screens/GameScreen.kt

@@ -12,12 +12,16 @@ import com.badlogic.gdx.math.Vector3
 import com.badlogic.gdx.utils.Array
 import com.badlogic.gdx.utils.TimeUtils
 import ktx.app.KtxScreen
-import ktx.assets.pool
 import ktx.assets.invoke
+import ktx.assets.pool
 import ktx.collections.iterate
 import ktx.graphics.use
+import ktx.log.debug
 import ktx.log.logger
-import me.msoucy.ptures.*
+import me.msoucy.ptures.MusicAssets
+import me.msoucy.ptures.SoundAssets
+import me.msoucy.ptures.TextureAtlasAssets
+import me.msoucy.ptures.get
 
 private val log = logger<GameScreen>()
 
@@ -54,7 +58,7 @@ class GameScreen(private val batch: Batch,
 
         // begin a new batch and draw the bucket and all drops
         batch.use { batch ->
-            font.draw(batch, "Drops Collected: " + dropsGathered, 0f, 480f)
+            font.draw(batch, "Drops Collected: $dropsGathered", 0f, 480f)
             batch.draw(bucketImage, bucket.x, bucket.y, bucket.width, bucket.height)
             activeRaindrops.forEach { r -> batch.draw(dropImage, r.x, r.y) }
         }

core/src/me/msoucy/ptures/view/TextView.kt

@@ -1,10 +1,7 @@
 package me.msoucy.ptures.view
 
-import me.msoucy.ptures.model.Creature
+import me.msoucy.ptures.model.*
-import me.msoucy.ptures.model.Skill
-import me.msoucy.ptures.model.SkillChoice
 import me.msoucy.ptures.model.Target
-import me.msoucy.ptures.model.VisibleStatus
 
 class SkillViewText(skill: Skill) : SkillView(skill) {
     override fun display() {
@@ -57,8 +54,7 @@ class CreatureViewText(playerId: Int, creature: Creature) : CreatureView(playerI
     }
 
     private fun chooseTargets(skill: Skill, possibleTargets: List<CreatureView>): List<Creature> {
-        val target = skill.damageSteps[0].target
+        return when (skill.damageSteps[0].target) {
-        return when (target) {
             Target.Self -> listOf(creature)
             Target.Selected -> listOf(selectSingleTarget(possibleTargets))
             Target.Others -> possibleTargets.filter { it.creature != creature }.map { it.creature }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 05 22:06:13 EST 2019
+#Sat May 23 20:21:08 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip