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

slightly more robust wire sim

Browse Source
This commit is contained in:
minjaesong
2024-10-04 21:46:46 +09:00
parent ad734a7561
commit 41fa1e6903
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import net.torvald.terrarum.gameworld.GameWorld.Companion.FLUID
import net.torvald.terrarum.modulebasegame.TerrarumIngame.Companion.inUpdateRange import net.torvald.terrarum.modulebasegame.TerrarumIngame.Companion.inUpdateRange
import net.torvald.terrarum.modulebasegame.gameactors.* import net.torvald.terrarum.modulebasegame.gameactors.*
import net.torvald.terrarum.modulebasegame.gameitems.AxeCore import net.torvald.terrarum.modulebasegame.gameitems.AxeCore
import net.torvald.terrarum.modulebasegame.gameitems.BlockBase.wireNodeMirror
import net.torvald.terrarum.realestate.LandUtil import net.torvald.terrarum.realestate.LandUtil
import net.torvald.terrarum.realestate.LandUtil.CHUNK_H import net.torvald.terrarum.realestate.LandUtil.CHUNK_H
import net.torvald.terrarum.realestate.LandUtil.CHUNK_W import net.torvald.terrarum.realestate.LandUtil.CHUNK_W
@@ -573,8 +574,24 @@ object WorldSimulator {
fun getAdjacent(cnx: Int, point: WireGraphCursor): List<WireGraphCursor> { fun getAdjacent(cnx: Int, point: WireGraphCursor): List<WireGraphCursor> {
val r = ArrayList<WireGraphCursor>() val r = ArrayList<WireGraphCursor>()
// check all four direction if I have connection to that direction
for (dir in intArrayOf(RIGHT, DOWN, LEFT, UP)) { for (dir in intArrayOf(RIGHT, DOWN, LEFT, UP)) {
if (cnx and dir != 0) r.add(point.copy().moveOneCell(dir)) // if I have a connection...
if (cnx and dir != 0) {
// check if the target cell is connected back to this cell
val nextPoint = point.copy().moveOneCell(dir)
val dirMirrored = dir.wireNodeMirror()
world.getWireGraphOf(nextPoint.x, nextPoint.y, wire)?.let { dirOfNextPoint ->
// if the other cell is connected back to this cell...
if (dirOfNextPoint and dirMirrored != 0) {
// add the nextPoint to the return list
r.add(nextPoint)
}
}
}
} }
return r return r
} }
@@ -597,7 +614,6 @@ object WorldSimulator {
while (wireSimPoints.notEmpty()) { while (wireSimPoints.notEmpty()) {
point = deq() point = deq()
// TODO if we found a power receiver, do something to it
world.getWireGraphOf(point.x, point.y, wire)?.let { connections -> world.getWireGraphOf(point.x, point.y, wire)?.let { connections ->
for (x in getAdjacent(connections, point)) { for (x in getAdjacent(connections, point)) {
if (!isMarked(x)) { if (!isMarked(x)) {