more wires moved from work_files into assets

assets/mods/basegame/wires/wires.csv

@@ -3,6 +3,9 @@
 "8193";"8193";"WIRE_GREEN";"signal";"digital_bit";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,1,10";"1"
 "8194";"8194";"WIRE_BLUE";"signal";"digital_bit";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,1,11";"1"
 #"8195";"8195";"WIRE_BUNDLE";"signal";"digital_3bits";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,1,2";"1"
+"8196";"8196";"WIRE_POWER_LOW";"power";"power_low";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,2,9";"1"
+"8197";"8197";"WIRE_POWER_HIGH";"power";"power_high";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,3,9";"1"
+"8198";"8198";"WIRE_ETHERNET_BUS";"network";"10base5";"3";"N/A";"N/A";"net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire";"basegame.items16,4,9";"0"
 
 
 # accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka "not wires")

src/net/torvald/terrarum/gameactors/ActorWithBody.kt

@@ -58,7 +58,7 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties)
 
     var drawMode = BlendMode.NORMAL
 
-    open var hasMoved: Boolean = false
+    open var isStationary: Boolean = true
         protected set
     open var tooltipText: String? = null // null: display nothing
     val mouseUp: Boolean
@@ -499,7 +499,7 @@ open class ActorWithBody(renderOrder: RenderOrder, val physProp: PhysProperties)
 
         }
 
-        hasMoved = (oldHitbox != hitbox)
+        isStationary = (hitbox - oldHitbox).magnitudeSquared < PHYS_EPSILON_VELO
     }
 
     /**

src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt

@@ -21,6 +21,8 @@ open class DroppedItem(private val itemID: ItemID, topLeftX: Int, topLeftY: Int)
 
     private val textureRegion = ItemCodex.getItemImage(itemID)
 
+    var itemCount = 1
+
     init {
         if (itemID.startsWith("actor@"))
             throw RuntimeException("Attempted to create DroppedItem actor of a real actor; the real actor must be dropped instead.")
@@ -86,5 +88,7 @@ open class DroppedItem(private val itemID: ItemID, topLeftX: Int, topLeftY: Int)
 
     override fun update(delta: Float) {
         super.update(delta)
+
+        // TODO merge into the already existing droppeditem with isStationary==true if one is detected
     }
 }