diff --git a/assets/tiling.frag b/assets/tiling.frag index cb783e518..48f43b649 100644 --- a/assets/tiling.frag +++ b/assets/tiling.frag @@ -40,7 +40,7 @@ uniform vec4 colourFilter = vec4(1, 1, 1, 1); // used by WALL to darken it uniform ivec2 cameraTranslation = ivec2(0, 0); -uniform float drawBreakage = 1f; +uniform float drawBreakage = 1f; // set it to 0f to not draw breakage; non-zero value to draw it ivec2 getTileXY(int tileNumber) { diff --git a/src/net/torvald/terrarum/modulebasegame/items/WirePieceSignalWire.kt b/src/net/torvald/terrarum/modulebasegame/items/WirePieceSignalWire.kt index ac284c5b8..228777759 100644 --- a/src/net/torvald/terrarum/modulebasegame/items/WirePieceSignalWire.kt +++ b/src/net/torvald/terrarum/modulebasegame/items/WirePieceSignalWire.kt @@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame.items import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.AppLoader +import net.torvald.terrarum.blockproperties.Wire import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.ItemID import net.torvald.terrarum.itemproperties.Material @@ -30,10 +31,10 @@ class WirePieceSignalWire(override val originalID: ItemID) : GameItem() { } override fun startPrimaryUse(delta: Float): Boolean { - return BlockBase.wireStartPrimaryUse(this, 64, delta) + return BlockBase.wireStartPrimaryUse(this, Wire.BIT_SIGNAL_RED, delta) } override fun effectWhenEquipped(delta: Float) { - BlockBase.wireEffectWhenEquipped(64, delta) + BlockBase.wireEffectWhenEquipped(Wire.BIT_SIGNAL_RED, delta) } } \ No newline at end of file diff --git a/work_files/graphics/terrain/wire_single_items.psd b/work_files/graphics/terrain/wire_single_items.psd index f5496f0c3..1d9ad489e 100644 --- a/work_files/graphics/terrain/wire_single_items.psd +++ b/work_files/graphics/terrain/wire_single_items.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c4c34c352932cc173d70c71c9244364c9d9df53fe2f2c1d4de402680f2998f4 -size 628894 +oid sha256:730c9a598ad86bb53db7bd26bf2976fecb5ad1ee254f8c6fe129f882ecb92237 +size 673848