From bbbc5e22a50a018651543a7f28d5b06180783d2d Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 6 Mar 2024 00:59:54 +0900 Subject: [PATCH] FixtureInteractionBlocked on blocks, walls and wires --- src/net/torvald/terrarum/ModMgr.kt | 3 ++- .../terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt index 6d8659c64..3c07d78ba 100644 --- a/src/net/torvald/terrarum/ModMgr.kt +++ b/src/net/torvald/terrarum/ModMgr.kt @@ -14,6 +14,7 @@ import net.torvald.terrarum.blockproperties.OreCodex import net.torvald.terrarum.blockproperties.WireCodex import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gamecontroller.IME +import net.torvald.terrarum.gameitems.FixtureInteractionBlocked import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.itemproperties.CraftingCodex @@ -568,7 +569,7 @@ object ModMgr { private fun makeNewItemObj(tile: BlockProp, isWall: Boolean) = object : GameItem( if (isWall) "wall@"+tile.id else tile.id - ) { + ), FixtureInteractionBlocked { override var baseMass: Double = (tile.density / 100.0) * (if (tile.isPlatform) 0.5 else 1.0) override var baseToolSize: Double? = null override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt index 656ada839..ce869d613 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WirePieceSignalWire.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.WireCodex import net.torvald.terrarum.gameactors.ActorWithBody +import net.torvald.terrarum.gameitems.FixtureInteractionBlocked import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.itemproperties.Material @@ -13,7 +14,8 @@ import net.torvald.terrarum.itemproperties.Material * * Created by minjaesong on 2019-03-10. */ -class WirePieceSignalWire(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int) : GameItem(originalID) { +class WirePieceSignalWire(originalID: ItemID, private val atlasID: String, private val sheetX: Int, private val sheetY: Int) + : GameItem(originalID), FixtureInteractionBlocked { override var dynamicID: ItemID = originalID override var baseMass = 0.001