diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_en_US.properties b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties similarity index 91% rename from TNTLeague/src/de/steamwar/tntleague/TNTLeague_en_US.properties rename to TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties index af68acab..9ab3eb16 100644 --- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_en_US.properties +++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties @@ -22,6 +22,8 @@ dealerPrice=Price: {0} Coins scoreboardTarget=Target: {0} scoreboardTime=Time: {0}:{1} +scoreboardCoins=Coins: {0} + ready=Ready notReady=Not ready isReady=Team {0} is ready! diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de_DE.properties b/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties similarity index 92% rename from TNTLeague/src/de/steamwar/tntleague/TNTLeague_de_DE.properties rename to TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties index 3da91f61..4765cba2 100644 --- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de_DE.properties +++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties @@ -10,7 +10,7 @@ notEnoughCoins=Du hast nicht genug Coins um dir das zu kaufen! gameStarting=Das Spiel beginnt in {0} Sekunden! gameStart=Start in {0} gameStarted=Das Spiel beginnt! -timeRemaining=noch {0} Minuten! +timeRemaining=noch {0} Minuten! gameEnded=Das Spiel ist vorbei! draw=Keiner hat gewonnen! chat={0}ยป {1} diff --git a/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt index bb9b0415..13e8e1b0 100644 --- a/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt +++ b/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt @@ -13,11 +13,14 @@ import org.bukkit.entity.EntityType import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.entity.EntityExplodeEvent +import org.bukkit.event.entity.EntityPickupItemEvent import org.bukkit.event.entity.PlayerDeathEvent +import org.bukkit.event.player.PlayerAttemptPickupItemEvent import org.bukkit.event.player.PlayerDropItemEvent import org.bukkit.event.player.PlayerInteractEntityEvent import org.bukkit.event.player.PlayerJoinEvent import org.bukkit.event.player.PlayerMoveEvent +import org.bukkit.event.player.PlayerPickupItemEvent import org.bukkit.event.player.PlayerQuitEvent object IngameListener: Listener { @@ -63,6 +66,17 @@ object IngameListener: Listener { } } + @EventHandler + fun onPickupCoins(e: PlayerAttemptPickupItemEvent) { + if (e.item.itemStack == DealerInventory.coins) { + TNTLeagueGame.getTeam(e.player)?.coins?.plus(e.item.itemStack.amount) + + e.item.itemStack.amount = 0 + e.isCancelled = true + e.flyAtPlayer = true + } + } + private fun getTeamByTargetLocation(location: Location): TNTLeagueTeam? = when (location) { in TNTLeagueWorldConfig.redTeam.target -> TNTLeagueGame.redTeam diff --git a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt index cafa70c2..2de35e2e 100644 --- a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt +++ b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt @@ -63,6 +63,8 @@ data class TNTLeagueTeam(val config: TNTLeagueWorldConfig.TeamConfig, private va } } + var coins: Int = 0 + val opposite: TNTLeagueTeam get() = when (team) { Team.BLUE -> TNTLeagueGame.redTeam diff --git a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt index 7b8da592..20151e84 100644 --- a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt +++ b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt @@ -47,6 +47,8 @@ data class TNTLeagueScoreboard(val p: Player): ScoreboardCallback { lines.add(translate("scoreboardTeam", translate(name).colorByTeam(this), (targetedBlocks - damagedBlocks).toString().yellow()).gray()) } + TNTLeagueGame.getTeam(p)?.coins?.let { lines.add(translate("scoreboardCoins", it.toString().yellow()).gray()) } + lines.add(Component.space().gray()) return lines