wanp/soil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

button press picking, rate limited

Browse Source
This commit is contained in:
veclavtalica 2025-02-16 15:18:50 +03:00
parent ff92434409
commit 322cdf1a05
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ingame/player.gd
View File

@ -24,6 +24,12 @@ var _interaction_selection: Node3D
var controls_disabled := false var controls_disabled := false
@export var held_thing := { "item_id": &"empty_hand", "count": 0 } @export var held_thing := { "item_id": &"empty_hand", "count": 0 }
## Whether picking input is pressed right now
var _picking := false
## Used to limit picking rate, potentially upgradable
var _last_picked := 0
var _picks_per_second := 3
# What the others see. # What the others see.
func _init_bystander() -> void: func _init_bystander() -> void:
@ -154,14 +160,9 @@ func _unhandled_input(event: InputEvent) -> void:
return return
if event.is_action_pressed("pick"): if event.is_action_pressed("pick"):
if _interaction_selection != null: _picking = true
if empty_handed(): if event.is_action_released("pick"):
_interaction_selection.owner.get_picked_up.rpc() _picking = false
hold_thing.rpc(_interaction_selection.owner.item_bundle)
elif GameState.are_bundles_stackable(held_thing, _interaction_selection.owner.item_bundle):
_interaction_selection.owner.get_picked_up.rpc()
var bundle := GameState.combine_bundles(held_thing, _interaction_selection.owner.item_bundle)
hold_thing.rpc(bundle)
if event.is_action_pressed("fire") and not empty_handed(): if event.is_action_pressed("fire") and not empty_handed():
var item := GameState.fetch().INVENTORY_ITEM_DB[held_thing["item_id"]] as InventoryItem var item := GameState.fetch().INVENTORY_ITEM_DB[held_thing["item_id"]] as InventoryItem
@ -190,10 +191,23 @@ func _set_projectile_authority(path: NodePath, authority_id: int) -> void:
func _process_input() -> void: func _process_input() -> void:
if controls_disabled: if controls_disabled or id != multiplayer.get_unique_id():
input_dir = Vector2.ZERO input_dir = Vector2.ZERO
input_jumped = false input_jumped = false
return return
input_dir = Input.get_vector("strafe_left", "strafe_right", "move_forward", "move_backward") input_dir = Input.get_vector("strafe_left", "strafe_right", "move_forward", "move_backward")
input_jumped = Input.is_action_just_pressed("jump") input_jumped = Input.is_action_just_pressed("jump")
if _picking and (Time.get_ticks_msec() - _last_picked) >= (1000.0 / _picks_per_second) \
and _interaction_selection != null:
if empty_handed():
_last_picked = Time.get_ticks_msec()
_interaction_selection.owner.get_picked_up.rpc()
hold_thing.rpc(_interaction_selection.owner.item_bundle)
elif GameState.are_bundles_stackable(held_thing, _interaction_selection.owner.item_bundle):
_last_picked = Time.get_ticks_msec()
_interaction_selection.owner.get_picked_up.rpc()
var bundle := GameState.combine_bundles(held_thing, _interaction_selection.owner.item_bundle)
hold_thing.rpc(bundle)
#_line_of_sight.force_shapecast_update()