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

working wire cutter

Browse Source
This commit is contained in:
minjaesong
2022-07-13 21:28:59 +09:00
parent 2a7e2b7ce4
commit c5360cdcb8
5 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/gameitems/BlockBase.kt
View File

@@ -76,6 +76,10 @@ object BlockBase {
(Terrarum.ingame!! as TerrarumIngame).selectedWireRenderClass = ""
}
private val wireVectorChars = arrayOf(
"· · · ·","· · · →","· · ↓ ·","· · ↓ →","· ← · ·","· ← · →","· ← ↓ ·","· ← ↓ →","↑ · · ·","↑ · · →","↑ · ↓ ·","↑ · ↓ →","↑ ← · ·","↑ ← · →","↑ ← ↓ ·","↑ ← ↓ →",
)
fun Int.toWireVectorBitsStr(): String = "[${wireVectorChars[this]}]($this)"
fun Int.wireNodeMirror() = this.shl(4).or(this).ushr(2).and(15)
fun wireNodesConnectedEachOther(oldToNewVector: Int, new: Int?, old: Int?): Boolean {
return if (new == null || old == null || oldToNewVector == 0) false
@@ -86,7 +90,7 @@ object BlockBase {
val q = newToOldVector and new
if (p == 0 && q == 0) false
else if (p > 0 && q > 0) true
else throw IllegalStateException("oldToNewVector = $oldToNewVector, new = $new, old == $old")
else throw IllegalStateException("oldToNewVector = ${oldToNewVector.toWireVectorBitsStr()}, new = ${new.toWireVectorBitsStr()}, old = ${old.toWireVectorBitsStr()}")
}
}

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

@@ -3,17 +3,19 @@ package net.torvald.terrarum.modulebasegame.gameitems
import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.Terrarum.toInt
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.mouseInInteractableRangeTools
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem
import net.torvald.terrarum.modulebasegame.gameitems.BlockBase.wireNodeMirror
import net.torvald.terrarum.notEmptyOrNull
import net.torvald.terrarum.toInt
import net.torvald.terrarum.utils.WiringGraphMap
/**
* Modular approach to the wire cutter function
@@ -22,8 +24,12 @@ import net.torvald.terrarum.toInt
*/
object WireCutterBase {
private fun disconnect(world: GameWorld, item: ItemID, x1: Int, y1: Int, x2: Int, y2: Int) {
private fun disconnect(item: ItemID, mapP: WiringGraphMap, mapN: WiringGraphMap, subTile: Terrarum.SubtileVector) {
val pBitMask = subTile.toInt() // bit mask to turn off
val nBitMask = pBitMask.wireNodeMirror()
mapP[item]!!.cnx = mapP[item]!!.cnx and (15 - pBitMask) // (15 - pBitMask) -> bit mask to retain
mapN[item]!!.cnx = mapN[item]!!.cnx and (15 - nBitMask)
}
fun startPrimaryUse(item: GameItem, actor: ActorWithBody, delta: Float, wireFilter: (ItemID) -> Boolean) = mouseInInteractableRangeTools(actor, item) {
@@ -37,7 +43,7 @@ object WireCutterBase {
if (mvec == Terrarum.SubtileVector.CENTRE) {
val wireNet = ingame.world.getAllWiresFrom(mtx, mty)
val wireItems = wireNet.first?.cloneToList()
val wireItems = wireNet.first
wireItems?.filter(wireFilter)?.notEmptyOrNull()?.forEach {
ingame.world.removeTileWire(mtx, mty, it, false)
@@ -50,16 +56,16 @@ object WireCutterBase {
val (ntx, nty) = mouseTile.nextTileCoord
val wireNetP = ingame.world.getAllWiresFrom(mtx, mty)
val wireNetN = ingame.world.getAllWiresFrom(mtx, mty)
val wireItemsP = wireNetP.first?.cloneToList()
val wireItemsN = wireNetN.first?.cloneToList()
val wireNetN = ingame.world.getAllWiresFrom(ntx, nty)
val wireItemsP = wireNetP.first
val wireItemsN = wireNetN.first
// get intersection of wireItemsP and wireItemsN
if (wireItemsP != null && wireItemsN != null) {
val wireItems = wireItemsP intersect wireItemsN
wireItems.filter(wireFilter).notEmptyOrNull()?.forEach {
disconnect(ingame.world, it, mtx, mty, ntx, nty)
disconnect(it, wireNetP.second!!, wireNetN.second!!, mouseTile.vector)
} ?: return@mouseInInteractableRangeTools false
true