diff --git a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt index 02f1d4446..f843cda36 100644 --- a/src/net/torvald/terrarum/TerrarumAppConfiguration.kt +++ b/src/net/torvald/terrarum/TerrarumAppConfiguration.kt @@ -78,6 +78,7 @@ basegame // Commit counts up to the Release 0.4.1: 3678 // Commit counts up to the Release 0.4.2: 3762 // Commit counts up to the Release 0.5.0: 4090 + // Commit counts up to the Release 0.5.1: 4097 val DEV_CYCLE: Map = mapOf( "Alpha" to 0x0000_000004_000000, diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalAdder.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalAdder.kt index 17fe08950..4f63abb65 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalAdder.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalAdder.kt @@ -14,11 +14,12 @@ import org.dyn4j.geometry.Vector2 */ class FixtureLogicSignalAdder : Electric, Reorientable { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 2, 2), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_ADDER"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBlocker.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBlocker.kt index f0b485464..4dc620343 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBlocker.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBlocker.kt @@ -34,11 +34,12 @@ interface Reorientable { */ class FixtureLogicSignalBlocker : Electric, Reorientable { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 2, 2), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_BLOCKER"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBulb.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBulb.kt index 7c70209a8..4c3a5c615 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBulb.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalBulb.kt @@ -18,6 +18,7 @@ class FixtureLogicSignalBulb : Electric { constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_COPPER_BULB"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalLatch.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalLatch.kt index 1618ee522..c01d8926b 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalLatch.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalLatch.kt @@ -16,11 +16,12 @@ import org.dyn4j.geometry.Vector2 */ class FixtureLogicSignalLatch : Electric, Reorientable { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 2, 3), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_LATCH"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalRepeaterHorz.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalRepeaterHorz.kt index 64ecf74a3..483a94bd7 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalRepeaterHorz.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalRepeaterHorz.kt @@ -16,11 +16,12 @@ import org.dyn4j.geometry.Vector2 class FixtureLogicSignalRepeaterHorz : Electric, Reorientable { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 2, 1), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_REPEATER"] } ) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalSwitchManual.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalSwitchManual.kt index 9e805b6d4..0c9385fa4 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalSwitchManual.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalSwitchManual.kt @@ -16,11 +16,12 @@ import org.dyn4j.geometry.Vector2 */ class FixtureLogicSignalSwitchManual : Electric { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_SWITCH"] } ) @@ -74,11 +75,12 @@ class FixtureLogicSignalSwitchManual : Electric { */ class FixtureLogicSignalPushbutton : Electric { - @Transient override val spawnNeedsFloor = true + @Transient override val spawnNeedsFloor = false @Transient override val spawnNeedsWall = true constructor() : super( BlockBox(BlockBox.NO_COLLISION, 1, 1), + renderOrder = RenderOrder.BEHIND, nameFun = { Lang["ITEM_LOGIC_SIGNAL_PUSHBUTTON"] } ) diff --git a/src/shaders/shadowshallow.frag b/src/shaders/shadowshallow.frag index 7c157bfed..e5594e950 100644 --- a/src/shaders/shadowshallow.frag +++ b/src/shaders/shadowshallow.frag @@ -10,11 +10,11 @@ uniform sampler2D u_texture; uniform sampler2D u_wall; out vec4 fragColor; -vec4 mult = vec4(0.0, 0.0, 0.0, 0.703); +vec4 mult = vec4(0.0, 0.0, 0.0, 1.4142); void main() { vec4 backcol = texture(u_wall, v_texCoords); vec4 incol = texture(u_texture, v_texCoords); - vec4 outcol = vec4(incol.rgb, backcol.a * pow(incol.a, 1.4142)); + vec4 outcol = vec4(incol.rgb, backcol.a * pow(incol.a, 2.0)); fragColor = mult * outcol; } \ No newline at end of file