Browse Source

Finish moving away from the QuickSlots singleton

pull/1/head
Ryan Reed 1 month ago
parent
commit
0d58cb3daa
3 changed files with 15 additions and 15 deletions
  1. +10
    -1
      autoloads/inventory_manager.gd
  2. +1
    -1
      scenes/player/ray_cast_3d.gd
  3. +4
    -13
      scenes/ui/quick_slots.gd

+ 10
- 1
autoloads/inventory_manager.gd View File

@ -1,7 +1,16 @@
extends Node
# QuickSlot related signals
signal next_quick_slot
signal previous_quick_slot
signal select_quick_slot(slot_index: int)
signal quick_slot_item_changed(item_id: String)
var quick_slot_item_id: String = "001"
func _ready() -> void:
self.quick_slot_item_changed.connect(_on_quick_slot_item_changed.bind())
func _on_quick_slot_item_changed(item_id: String) -> void:
quick_slot_item_id = item_id

+ 1
- 1
scenes/player/ray_cast_3d.gd View File

@ -10,7 +10,7 @@ func _process(_delta: float) -> void:
(collider as Block).interact_left_click()
if Input.is_action_just_pressed("right_click_interact"):
EntityManager.create_block.emit(
QuickSlots.ref.get_selected_item(),
InventoryManager.quick_slot_item_id,
collider.position + get_collision_normal()
)


+ 4
- 13
scenes/ui/quick_slots.gd View File

@ -1,24 +1,15 @@
class_name QuickSlots
extends Node
#region Singleton
static var ref: QuickSlots
func _init() -> void:
if not ref:
ref = self
else:
queue_free()
var _items: Array[String] = ["001", "002", "003", "004"]
var _selected_item: int = 0
func _init() -> void:
InventoryManager.next_quick_slot.connect(select_next_item.bind())
InventoryManager.previous_quick_slot.connect(select_previous_item.bind())
InventoryManager.select_quick_slot.connect(select_item_index.bind())
#endregion
var _items: Array[String] = ["001", "002", "003", "004"]
var _selected_item: int = 0
func _unhandled_input(event: InputEvent) -> void:
if event.is_action_pressed("quickslot0"):


Loading…
Cancel
Save