From c829245b41d46c0544dc49255b81f9212765fab2 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 11 Mar 2024 23:59:21 +0900 Subject: [PATCH] some changes --- src/net/torvald/terrarum/gameactors/ActorWithBody.kt | 3 --- .../terrarum/modulebasegame/gameactors/FixtureTapestry.kt | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index baad78fc2..a513f788c 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -685,9 +685,6 @@ open class ActorWithBody : Actor { // isStationary = (hitbox - oldHitbox).magnitudeSquared < PHYS_EPSILON_VELO isStationary = isCloseEnough(hitbox.startX, oldHitbox.startX) && // this is supposed to be more accurate, idk isCloseEnough(hitbox.startY, oldHitbox.startY) - - - printdbg(this, tooltipShowing.keys.sorted()) } fun getDrag(externalForce: Vector2): Vector2 { diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTapestry.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTapestry.kt index 30f6b92c8..0e892e0a9 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTapestry.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureTapestry.kt @@ -21,8 +21,9 @@ internal class FixtureTapestry : FixtureBase { @Transient override val spawnNeedsWall = true @Transient override val spawnNeedsFloor = false - var artName = ""; private set - var artAuthor = ""; private set + // these properties are transient as they are filled in by reading a binary file + @Transient var artName = ""; private set + @Transient var artAuthor = ""; private set // val tw = 1 // val th = 1 @@ -109,6 +110,7 @@ internal class FixtureTapestry : FixtureBase { App.disposables.add(texture) + // must be re-spawned on reload to make it visible after load spawn( intTilewiseHitbox.canonicalX.toInt(), intTilewiseHitbox.canonicalY.toInt(), @@ -118,5 +120,5 @@ internal class FixtureTapestry : FixtureBase { ) } - override var tooltipText: String? = "TEST\nSTRING"//if (artName.length + artAuthor.length > 0) "$artName\n$artAuthor" else null + override var tooltipText: String? = if (artName.length + artAuthor.length > 0) "$artName\n$artAuthor" else null }