curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 12:04:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

spawning of dropped item

Browse Source
This commit is contained in:
minjaesong
2021-08-06 21:43:50 +09:00
parent edc3d53f4e
commit ecce123299
9 changed files with 140 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -463,7 +463,7 @@ open class GameWorld : Disposable {
/**
* @return true if block is broken
*/
fun inflictTerrainDamage(x: Int, y: Int, damage: Double): Boolean {
fun inflictTerrainDamage(x: Int, y: Int, damage: Double): ItemID? {
val damage = damage.toFloat()
val addr = LandUtil.getBlockAddr(this, x, y)
@@ -483,12 +483,13 @@ open class GameWorld : Disposable {
// remove tile from the world
if (terrainDamages[addr] ?: 0f >= BlockCodex[getTileFromTerrain(x, y)].strength) {
val tileBroke = getTileFromTerrain(x, y)
setTileTerrain(x, y, Block.AIR, false)
terrainDamages.remove(addr)
return true
return tileBroke
}
return false
return null
}
fun getTerrainDamage(x: Int, y: Int): Float =
terrainDamages[LandUtil.getBlockAddr(this, x, y)] ?: 0f
@@ -496,7 +497,7 @@ open class GameWorld : Disposable {
/**
* @return true if block is broken
*/
fun inflictWallDamage(x: Int, y: Int, damage: Double): Boolean {
fun inflictWallDamage(x: Int, y: Int, damage: Double): ItemID? {
val damage = damage.toFloat()
val addr = LandUtil.getBlockAddr(this, x, y)
@@ -512,12 +513,13 @@ open class GameWorld : Disposable {
// remove tile from the world
if (wallDamages[addr]!! >= BlockCodex[getTileFromWall(x, y)].strength) {
val tileBroke = getTileFromWall(x, y)
setTileWall(x, y, Block.AIR, false)
wallDamages.remove(addr)
return true
return tileBroke
}
return false
return null
}
fun getWallDamage(x: Int, y: Int): Float =
wallDamages[LandUtil.getBlockAddr(this, x, y)] ?: 0f