This commit is contained in:
minjaesong
2019-05-08 21:23:42 +09:00
parent 0ccfb0e709
commit b217a023d2
3 changed files with 6 additions and 5 deletions

View File

@@ -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 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) { ivec2 getTileXY(int tileNumber) {

View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame.items
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.AppLoader import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.blockproperties.Wire
import net.torvald.terrarum.itemproperties.GameItem import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.ItemID import net.torvald.terrarum.itemproperties.ItemID
import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.itemproperties.Material
@@ -30,10 +31,10 @@ class WirePieceSignalWire(override val originalID: ItemID) : GameItem() {
} }
override fun startPrimaryUse(delta: Float): Boolean { 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) { override fun effectWhenEquipped(delta: Float) {
BlockBase.wireEffectWhenEquipped(64, delta) BlockBase.wireEffectWhenEquipped(Wire.BIT_SIGNAL_RED, delta)
} }
} }