From 3959de68b1b9214b4b27ea8957ac1b84e15c1a05 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 3 Mar 2024 21:18:23 +0900 Subject: [PATCH] switch glow sprite --- .../mods/basegame/sprites/fixtures/signal_switch_glow.tga | 3 +++ src/net/torvald/terrarum/TerrarumAppConfiguration.kt | 6 +++--- .../modulebasegame/gameactors/FixtureSignalSwitchManual.kt | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 assets/mods/basegame/sprites/fixtures/signal_switch_glow.tga diff --git a/assets/mods/basegame/sprites/fixtures/signal_switch_glow.tga b/assets/mods/basegame/sprites/fixtures/signal_switch_glow.tga new file mode 100644 index 000000000..687b221d4 --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/signal_switch_glow.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:468630633fcaa2ebd93a3056daf4c2c68d3420b499721f1028401e944632ae04 +size 16402 diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index 81fe876dc..f43ec16f3 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -69,7 +69,7 @@ basegame * e.g. 0x02010034 will be translated as 2.1.52 * */ - const val VERSION_RAW: Long = 0x0000_000004_000001 + const val VERSION_RAW: Long = 0x0000_000004_000002 // Commit counts up to the Release 0.3.0: 2259 // Commit counts up to the Release 0.3.1: 2278 // Commit counts up to the Release 0.3.2: 2732 @@ -77,9 +77,9 @@ basegame // Commit counts up to the Release 0.4.0: 3631 // Commit counts up to the Release 0.4.1: 3678 -// val VERSION_SNAPSHOT = Snapshot(0) // for normal dev + val VERSION_SNAPSHOT = Snapshot(0) // for normal dev // val VERSION_SNAPSHOT = ForcedSnapshot("24w07d") // for snapshot release - val VERSION_SNAPSHOT = null // for the release +// val VERSION_SNAPSHOT = null // for the release const val VERSION_TAG: String = "" diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt index de7032112..de0e1e12c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSignalSwitchManual.kt @@ -28,6 +28,7 @@ class FixtureSignalSwitchManual : Electric { init { val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_switch.tga") + val itemImage2 = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_switch_glow.tga") density = 1400.0 setHitboxDimension(TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE, 0, 1) @@ -37,6 +38,11 @@ class FixtureSignalSwitchManual : Electric { it.currentFrame = variant it.delays = floatArrayOf(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY) } + makeNewSpriteGlow(TextureRegionPack(itemImage2.texture, TerrarumAppConfiguration.TILE_SIZE, TerrarumAppConfiguration.TILE_SIZE)).let { + it.setRowsAndFrames(2,8) + it.currentFrame = variant + it.delays = floatArrayOf(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY) + } actorValue[AVKey.BASEMASS] = FixtureLogicSignalEmitter.MASS