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

dropped item can be picked up (at a weird distance)

Browse Source
This commit is contained in:
minjaesong
2021-10-02 17:50:27 +09:00
parent 6fda6bafe4
commit f6b0b447a4
5 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -114,6 +114,7 @@ open class GameWorld() : Disposable {
internal var genver = -1
internal var comp = -1
@Deprecated("This value is only used for savegames; DO NOT USE THIS", ReplaceWith("INGAME.actorContainerActive", "net.torvald.terrarum.INGAME"))
internal val actors = ArrayList<ActorID>() // only filled up on save and load; DO NOT USE THIS
/**

32
src/net/torvald/terrarum/gameworld/WorldSimulator.kt
View File

@@ -5,11 +5,11 @@ import net.torvald.terrarum.*
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.blockproperties.Block
import net.torvald.terrarum.blockproperties.Fluid
import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameactors.Controllable
import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.modulebasegame.TerrarumIngame.Companion.inUpdateRange
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
import net.torvald.terrarum.modulebasegame.gameactors.Electric
import net.torvald.terrarum.modulebasegame.gameactors.FixtureBase
import net.torvald.terrarum.modulebasegame.gameactors.*
import org.dyn4j.geometry.Vector2
import kotlin.math.roundToInt
@@ -88,6 +88,9 @@ object WorldSimulator {
App.measureDebugTime("WorldSimulator.wires") {
simulateWires(delta)
}
App.measureDebugTime("WorldSimulator.collisionDroppedItem") {
collideDroppedItems()
}
//printdbg(this, "============================")
}
@@ -140,6 +143,29 @@ object WorldSimulator {
} }
}
fun collideDroppedItems() {
ingame.actorContainerActive.filter { it is DroppedItem }.forEach { droppedItem0 ->
val droppedItem = droppedItem0 as DroppedItem
if (droppedItem.canBePickedUp()) {
val actors = ingame.findKNearestActors(droppedItem0 as ActorWithBody, 64) { it is Controllable && it is Pocketed }
for (result in actors) {
val actor = result.get()
// if hitbox overlaps, pick up
val s = actor.scale
val w = actor.baseHitboxW * s
val h = actor.baseHitboxH * s
val pickupDistance = w*w + h*h// TODO refer to the actorValue
// println("${result.distance}\t$pickupDistance")
if (result.distance < pickupDistance) {
droppedItem.flagDespawn = true
(actor as Pocketed).inventory.add(droppedItem.itemID, droppedItem.itemCount)
break
}
}
}
}
}
/**
* displace fluids. Note that the code assumes the gravity pulls things downward ONLY,
* which means you'll need to modify the code A LOT if you're going to implement zero- or