curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

axle test with test-motor

Browse Source
This commit is contained in:
minjaesong
2024-10-03 21:35:52 +09:00
parent dd643005a4
commit 0e58879216
10 changed files with 133 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/WorldSimulator.kt
View File

@@ -531,7 +531,7 @@ object WorldSimulator {
}
private fun calculateDecay(signal: Vector2, dist: Int, wire: ItemID, signalType: WireEmissionType): Vector2 {
val d = WireCodex.wireDecays[wire]!!
val d = WireCodex.wireDecays[wire] ?: 1.0
return signal * d.pow(dist.toDouble())
}

53
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureInductionMotor.kt Normal file
View File

@@ -0,0 +1,53 @@
package net.torvald.terrarum.modulebasegame.gameactors
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.tooltipShowing
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
import org.dyn4j.geometry.Vector2
/**
* Created by minjaesong on 2024-10-03.
*/
class FixtureInductionMotor : Electric {
@Transient override val spawnNeedsFloor = true
@Transient override val spawnNeedsWall = false
constructor() : super(
BlockBox(BlockBox.NO_COLLISION, 1, 1),
nameFun = { Lang["ITEM_INDUCTION_MOTOR"] }
)
init {
val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/induction_motor.tga")
density = 7874.0
setHitboxDimension(TILE_SIZE, TILE_SIZE, 0, 0)
makeNewSprite(TextureRegionPack(itemImage.texture, TILE_SIZE, TILE_SIZE)).let {
it.setRowsAndFrames(1,1)
}
actorValue[AVKey.BASEMASS] = MASS
setWireEmitterAt(0, 0, "axle")
setWireEmissionAt(0, 0, Vector2(16.0, 1024.0)) // speed and torque
}
override fun updateSignal() {
setWireEmissionAt(0, 0, Vector2(16.0, 1024.0)) // speed and torque
}
override fun dispose() {
tooltipShowing.remove(tooltipHash)
}
companion object {
const val MASS = 20.0
}
}

37
src/net/torvald/terrarum/modulebasegame/gameitems/ItemInductionMotor.kt Normal file
View File

@@ -0,0 +1,37 @@
package net.torvald.terrarum.modulebasegame.gameitems
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameactors.FixtureInductionMotor
/**
* Created by minjaesong on 2024-10-03.
*/
class ItemInductionMotor(originalID: ItemID) : FixtureItemBase(originalID, "net.torvald.terrarum.modulebasegame.gameactors.FixtureInductionMotor") {
override var dynamicID: ItemID = originalID
override var baseMass = FixtureInductionMotor.MASS
override val canBeDynamic = false
override val materialId = ""
init {
itemImage = getItemImageFromSheet("basegame", "sprites/fixtures/induction_motor.tga", TILE_SIZE, TILE_SIZE)
}
override var baseToolSize: Double? = baseMass
override var originalName = "ITEM_INDUCTION_MOTOR"
override var inventoryCategory = Category.FIXTURE
override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
super.effectWhileEquipped(actor, delta)
(Terrarum.ingame!! as TerrarumIngame).selectedWireRenderClass = "axle"
}
override fun effectOnUnequip(actor: ActorWithBody) {
super.effectOnUnequip(actor)
(Terrarum.ingame!! as TerrarumIngame).selectedWireRenderClass = ""
}
}

6
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import kotlin.math.roundToInt
@@ -47,6 +48,7 @@ class UIQuickslotBar : UICanvas() {
const val SLOT_COUNT = 10
const val DISPLAY_OPACITY = 0.92f
const val COMMON_OPEN_CLOSE = 0.12f
val QUICKSLOT_ITEMCOUNT_TEXTCOL = Color(0xde4185ff.toInt())
}
@@ -98,8 +100,6 @@ class UIQuickslotBar : UICanvas() {
private val drawColor = Color(1f, 1f, 1f, 1f)
private val itemCntTextCol = Color(0x404040ff)
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
(Terrarum.ingame!! as TerrarumIngame).actorNowPlaying?.let { actor ->
@@ -139,7 +139,7 @@ class UIQuickslotBar : UICanvas() {
}
else if (item.stackable) {
val amountString = qs!!.qty.toItemCountText()
batch.color = Color(0xfff066_ff.toInt())
batch.color = QUICKSLOT_ITEMCOUNT_TEXTCOL
val textLen = amountString.length * App.fontSmallNumbers.W
val y = slotY + 25 - App.fontSmallNumbers.H
val x = slotX - 19 + (38 - textLen) / 2

3
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.COMMON_OPEN_CLOSE
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.QUICKSLOT_ITEMCOUNT_TEXTCOL
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.SLOT_COUNT
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
@@ -110,7 +111,7 @@ class UIQuickslotPie : UICanvas() {
}
else if (item.stackable) {
val amountString = qs!!.qty.toItemCountText()
batch.color = Color(0xfff066_ff.toInt())
batch.color = QUICKSLOT_ITEMCOUNT_TEXTCOL
val textLen = amountString.length * App.fontSmallNumbers.W
val y = slotY + 25 - App.fontSmallNumbers.H
val x = slotX - 19 + (38 - textLen) / 2