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

player is now nullable; wtf is calling Ingame 5 times?

Browse Source
This commit is contained in:
minjaesong
2018-09-17 01:46:50 +09:00
parent 5049400b3b
commit d95eaf5be0
35 changed files with 252 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/itemproperties/ItemCodex.kt
View File

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