curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

imprved comments

Browse Source
This commit is contained in:
minjaesong
2022-03-02 09:13:47 +09:00
parent 6906d24e59
commit 0695dd843a
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameitems/ItemWearableWorldRadar.kt
View File

@@ -15,6 +15,7 @@ import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.gameitems.FixtureItemBase
import net.torvald.terrarum.modulecomputers.tsvmperipheral.WorldRadar
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
@@ -36,7 +37,8 @@ class ItemWearableWorldRadar(originalID: String) : GameItem(originalID) {
override val isDynamic = true
override val material = Material()
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsTextureRegion("basegame-sprites-fixtures-signal_source.tga")
get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
override var baseToolSize: Double? = baseMass

5
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt
View File

@@ -40,6 +40,11 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange {
private constructor() : super(RenderOrder.BEHIND, PhysProperties.IMMOBILE, null)
/**
* Making the sprite: do not address the CommonResourcePool directly; just do it like this snippet:
*
* ```makeNewSprite(FixtureBase.getSpritesheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32))```
*/
constructor(
blockBox0: BlockBox,
blockBoxProps: BlockBoxProps = BlockBoxProps(0),

7
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureLogicSignalEmitter.kt
View File

@@ -26,13 +26,6 @@ class FixtureLogicSignalEmitter : FixtureBase, Electric {
init {
val itemImage = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
CommonResourcePool.addToLoadingList("basegame-sprites-fixtures-signal_source.tga") {
val t = TextureRegion(Texture(ModMgr.getGdxFile("basegame", "sprites/fixtures/signal_source.tga")))
t.flip(false, false)
/*return*/t
}
CommonResourcePool.loadAll()
density = 1400.0
setHitboxDimension(TILE_SIZE, TILE_SIZE, 0, -1)

7
src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt
View File

@@ -40,8 +40,15 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G
override val isUnique = false
override val isDynamic = false
override val material = Material()
/**
* Do not address the CommonResourcePool directly; just do it like this snippet:
*
* ```get() = FixtureItemBase.getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")```
*/
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_32")
override var baseToolSize: Double? = baseMass
override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {