From 1059b4e09749fe55ec3b8db74db9c0b06b405fcb Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 16 Aug 2021 00:27:28 +0900 Subject: [PATCH] more wires moved from work_files into assets --- assets/mods/basegame/wires/8196.tga | 3 +++ assets/mods/basegame/wires/8197.tga | 3 +++ assets/mods/basegame/wires/8198.tga | 3 +++ assets/mods/basegame/wires/ports.tga | 3 +++ assets/mods/basegame/wires/wire.tga | 3 --- assets/mods/basegame/wires/wire.tga.gz | 3 --- assets/mods/basegame/wires/wires.csv | 3 +++ src/net/torvald/terrarum/gameactors/ActorWithBody.kt | 4 ++-- .../torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt | 4 ++++ work_files/graphics/wires/wires_collection_powerwires.kra | 4 ++-- work_files/graphics/wires/wires_collection_transistors.kra | 4 ++-- 11 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 assets/mods/basegame/wires/8196.tga create mode 100644 assets/mods/basegame/wires/8197.tga create mode 100644 assets/mods/basegame/wires/8198.tga create mode 100644 assets/mods/basegame/wires/ports.tga delete mode 100644 assets/mods/basegame/wires/wire.tga delete mode 100644 assets/mods/basegame/wires/wire.tga.gz diff --git a/assets/mods/basegame/wires/8196.tga b/assets/mods/basegame/wires/8196.tga new file mode 100644 index 000000000..6c4e09e13 --- /dev/null +++ b/assets/mods/basegame/wires/8196.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07671e33f4644061ffbf67374fcbd7cfd3d15e58d98919dc1be68808465b4b8c +size 16402 diff --git a/assets/mods/basegame/wires/8197.tga b/assets/mods/basegame/wires/8197.tga new file mode 100644 index 000000000..ecaeabe83 --- /dev/null +++ b/assets/mods/basegame/wires/8197.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f29deb163eb0f3417f054df9f5c73722d76a2a8e408adca32ec30ef3c3bef6 +size 16402 diff --git a/assets/mods/basegame/wires/8198.tga b/assets/mods/basegame/wires/8198.tga new file mode 100644 index 000000000..e10d5f5c3 --- /dev/null +++ b/assets/mods/basegame/wires/8198.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a89f89f5d738ce908dc120555a252de667d3a6560d7ca9a22ba86f3d1b6a558d +size 32786 diff --git a/assets/mods/basegame/wires/ports.tga b/assets/mods/basegame/wires/ports.tga new file mode 100644 index 000000000..fc561a72c --- /dev/null +++ b/assets/mods/basegame/wires/ports.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d5ac85849d7f6daafb976dcc6172ba072f21e57146cd28bafaceb20c549e22 +size 16402 diff --git a/assets/mods/basegame/wires/wire.tga b/assets/mods/basegame/wires/wire.tga deleted file mode 100644 index ec2518274..000000000 --- a/assets/mods/basegame/wires/wire.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:662822bb2dc056f6568896430fd48bd4954daf582ef2cb75fa77f9c80be35ec0 -size 262162 diff --git a/assets/mods/basegame/wires/wire.tga.gz b/assets/mods/basegame/wires/wire.tga.gz deleted file mode 100644 index ee55db2ef..000000000 --- a/assets/mods/basegame/wires/wire.tga.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:081448d4efc77e674ea0e7a07ecfd806546353ac585a4c7ec85a04c73058b412 -size 31643 diff --git a/assets/mods/basegame/wires/wires.csv b/assets/mods/basegame/wires/wires.csv index a8ef781b0..0a6144d33 100644 --- a/assets/mods/basegame/wires/wires.csv +++ b/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") diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 4a2e5579a..3a2267cbd 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/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 } /** diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt index 5381b85ab..51e4c7089 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt +++ b/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 } } \ No newline at end of file diff --git a/work_files/graphics/wires/wires_collection_powerwires.kra b/work_files/graphics/wires/wires_collection_powerwires.kra index 716de30ba..66c166f8b 100644 --- a/work_files/graphics/wires/wires_collection_powerwires.kra +++ b/work_files/graphics/wires/wires_collection_powerwires.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d06f7279f67daa7438197a31968e1e0974e8f65ec6442cbd67489f7cb168de6c -size 60788 +oid sha256:2be3c1e5cfaad9f0a7b7827f146871d892a889020acb73848c902015519e4ce8 +size 170986 diff --git a/work_files/graphics/wires/wires_collection_transistors.kra b/work_files/graphics/wires/wires_collection_transistors.kra index 744b03c1f..e3f5c8996 100644 --- a/work_files/graphics/wires/wires_collection_transistors.kra +++ b/work_files/graphics/wires/wires_collection_transistors.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:172900bdbc9e1e97377d1d8746f07cd7d0625af2d0c1a42a21d2088853757d3b -size 167024 +oid sha256:4f9802936779b24683728b783f12da67e73338beacc0a06d7aa6149a7aaab4b2 +size 171536