Dependency updates
This commit is contained in:
@@ -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>() {
|
||||
|
@@ -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 {
|
||||
|
@@ -1,7 +1,5 @@
|
||||
package me.msoucy.ptures.model
|
||||
|
||||
import me.msoucy.ptures.controller.Engine
|
||||
|
||||
sealed class Status {
|
||||
|
||||
open fun onTurnStart(creature: Creature) {
|
||||
|
@@ -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) }
|
||||
}
|
||||
|
@@ -1,10 +1,7 @@
|
||||
package me.msoucy.ptures.view
|
||||
|
||||
import me.msoucy.ptures.model.Creature
|
||||
import me.msoucy.ptures.model.Skill
|
||||
import me.msoucy.ptures.model.SkillChoice
|
||||
import me.msoucy.ptures.model.*
|
||||
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 (target) {
|
||||
return when (skill.damageSteps[0].target) {
|
||||
Target.Self -> listOf(creature)
|
||||
Target.Selected -> listOf(selectSingleTarget(possibleTargets))
|
||||
Target.Others -> possibleTargets.filter { it.creature != creature }.map { it.creature }
|
||||
|
Reference in New Issue
Block a user