curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-16 08:36:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

wirecutter now ignores axles

Browse Source
This commit is contained in:
minjaesong
2024-10-10 00:28:47 +09:00
parent b428273fa2
commit 6dd633d2bf
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt
View File

@@ -641,7 +641,9 @@ object WorldSimulator {
} }
} }
} }
fixture?.first?.updateOnWireGraphTraversal(tileOffsetFromFixture!!.x, tileOffsetFromFixture!!.y, fixture!!.second)
if (fixture != null && tileOffsetFromFixture != null)
fixture!!.first.updateOnWireGraphTraversal(tileOffsetFromFixture!!.x, tileOffsetFromFixture!!.y, fixture!!.second)
} }
} }

9
src/net/torvald/terrarum/modulebasegame/gameitems/WireCutterAll.kt
View File

@@ -106,14 +106,9 @@ class WireCutterAll(originalID: ItemID) : GameItem(originalID), FixtureInteracti
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long { override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
val itemToRemove = UIWireCutterPie.getWireItemID(actor.actorValue.getAsInt(AVKey.__PLAYER_WIRECUTTERSEL) ?: 0) val itemToRemove = UIWireCutterPie.getWireItemID(actor.actorValue.getAsInt(AVKey.__PLAYER_WIRECUTTERSEL) ?: 0).split(';')
val filter = if (itemToRemove == "__all__") { val filter = { it: ItemID -> itemToRemove.contains(it) }
{ it: ItemID -> true }
}
else {
{ it: ItemID -> it == itemToRemove }
}
return WireCutterBase.startPrimaryUse(this, actor, delta, filter) return WireCutterBase.startPrimaryUse(this, actor, delta, filter)
} }

2
src/net/torvald/terrarum/modulebasegame/ui/UIWireCutterPie.kt
View File

@@ -88,7 +88,7 @@ class UIWireCutterPie(val itemID: ItemID) : UICanvas() {
fun getWireItemID(index: Int): String { fun getWireItemID(index: Int): String {
return when (index) { return when (index) {
0 -> "__all__" 0 -> "wire@basegame:8192;wire@basegame:8193;wire@basegame:8194;wire@basegame:8195;wire@basegame:8196;wire@basegame:1;wire@basegame:2;wire@basegame:3;wire@basegame:4;wire@basegame:16;wire@basegame:17;wire@basegame:18;wire@basegame:19"
1 -> "wire@basegame:8192" 1 -> "wire@basegame:8192"
2 -> "wire@basegame:8193" 2 -> "wire@basegame:8193"
3 -> "wire@basegame:8194" 3 -> "wire@basegame:8194"