generalised things so that they would work outside of ingame.world; title screen wip

This commit is contained in:
minjaesong
2017-07-21 19:59:51 +09:00
parent cb8d3fd8b9
commit f1391bea6f
68 changed files with 1141 additions and 328 deletions

View File

@@ -130,7 +130,7 @@ object ItemCodex {
override fun primaryUse(delta: Float): Boolean {
val mousePoint = Point2d(Terrarum.mouseTileX.toDouble(), Terrarum.mouseTileY.toDouble())
val actorvalue = Terrarum.ingame!!.player!!.actorValue
val actorvalue = Terrarum.ingame!!.player.actorValue
using = true
@@ -153,7 +153,7 @@ object ItemCodex {
Terrarum.ingame!!.world.inflictTerrainDamage(
Terrarum.mouseTileX,
Terrarum.mouseTileY,
Calculate.pickaxePower(Terrarum.ingame!!.player!!, material) * swingDmgToFrameDmg
Calculate.pickaxePower(Terrarum.ingame!!.player, material) * swingDmgToFrameDmg
)
return true
}
@@ -161,7 +161,7 @@ object ItemCodex {
override fun endPrimaryUse(delta: Float): Boolean {
using = false
// reset action timer to zero
Terrarum.ingame!!.player!!.actorValue[AVKey.__ACTION_TIMER] = 0.0
Terrarum.ingame!!.player.actorValue[AVKey.__ACTION_TIMER] = 0.0
return true
}
}*/