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

no-auto-pickup variant of droppeditem

Browse Source
This commit is contained in:
minjaesong
2025-03-09 12:56:26 +09:00
parent 19bc779ae1
commit bdd00676e6
7 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt
View File

@@ -96,7 +96,7 @@ class ActorInventory() : FixtureInventory() {
}
}
fun getQuickslotItem(slot: Int): InventoryPair? = searchByID(quickSlot[slot])
fun getQuickslotItem(slot: Int?): InventoryPair? = if (slot == null) null else searchByID(quickSlot[slot])
fun consumeItem(item: GameItem, amount: Long = 1L) {
val actor = this.actor as Actor

9
src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt
View File

@@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion
import com.jme3.math.FastMath
import net.torvald.gdx.graphics.Cvec
import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED
import net.torvald.terrarum.gameactors.*
@@ -39,7 +38,9 @@ class DroppedItem : ActorWithBody {
private var timeSinceSpawned = 0f
fun canBePickedUp() = timeSinceSpawned > NO_PICKUP_TIME && !flagDespawn
var noAutoPickup = false
fun canBePickedUpAutomatically() = !noAutoPickup && timeSinceSpawned > NO_PICKUP_TIME && !flagDespawn
private val randKey1 = (Math.random() * 256).toInt()
private val randKey2 = (Math.random() * 256).toInt()
@@ -53,7 +54,7 @@ class DroppedItem : ActorWithBody {
* @param topLeftX world-wise coord
* @param topLeftY world-wise coord
*/
constructor(itemID: ItemID, centreX: Double, bottomY: Double, spawnVelo: Vector2? = null) : super(RenderOrder.OVERLAY, PhysProperties.PHYSICS_OBJECT()) {
constructor(itemID: ItemID, centreX: Double, bottomY: Double, spawnVelo: Vector2? = null, noAutoPickup: Boolean = false) : super(RenderOrder.OVERLAY, PhysProperties.PHYSICS_OBJECT()) {
this.itemID = itemID
if (itemID.isActor())
@@ -94,6 +95,8 @@ class DroppedItem : ActorWithBody {
// printdbg(this, "DroppedItem with itemID '${itemID}'")
physProp.ignorePlatform = false
this.noAutoPickup = noAutoPickup
}