diff --git a/autoloads/globals.gd b/autoloads/globals.gd deleted file mode 100644 index 9b0b110..0000000 --- a/autoloads/globals.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node - - -const BLOCK_PREFAB: PackedScene = preload("res://scenes/blocks/block.tscn") -const DROPPED_BLOCK_PREFAB: PackedScene = preload("res://scenes/blocks/dropped_block.tscn") diff --git a/autoloads/globals.gd.uid b/autoloads/globals.gd.uid deleted file mode 100644 index 032305e..0000000 --- a/autoloads/globals.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://cp6sum1t6el0a diff --git a/project.godot b/project.godot index 5c674bc..5a25fdc 100644 --- a/project.godot +++ b/project.godot @@ -18,7 +18,6 @@ config/icon="uid://f6hee5t26uqt" [autoload] -Globals="*res://autoloads/globals.gd" EntityManager="*res://autoloads/entity_manager.gd" InventoryManager="*res://autoloads/inventory_manager.gd" DBItems="*res://autoloads/db_items.gd" diff --git a/scenes/blocks/block.gd b/scenes/blocks/block.gd index 8ad8bdc..2e3fbf3 100644 --- a/scenes/blocks/block.gd +++ b/scenes/blocks/block.gd @@ -1,6 +1,7 @@ class_name Block extends StaticBody3D +const PREFAB: PackedScene = preload("res://scenes/blocks/block.tscn") @export var block_mesh: BlockMesh @export var collision_shape: CollisionShape3D diff --git a/scenes/blocks/dropped_block.gd b/scenes/blocks/dropped_block.gd index 6a622bb..867ae6c 100644 --- a/scenes/blocks/dropped_block.gd +++ b/scenes/blocks/dropped_block.gd @@ -2,6 +2,8 @@ class_name DroppedBlock extends RigidBody3D +const PREFAB: PackedScene = preload("res://scenes/blocks/dropped_block.tscn") + ## The amount of time to wait before PickupArea is set to monitorable[br] ## This is to ensure that the item isn't picked up immediately after throwing @export var pickup_timeout: int = 1 diff --git a/scenes/world/world.gd b/scenes/world/world.gd index a2442a8..6fdc57d 100644 --- a/scenes/world/world.gd +++ b/scenes/world/world.gd @@ -64,14 +64,14 @@ func spawn_player(player_position: Transform3D) -> void: func _create_block(id: String, block_position: Vector3) -> void: - var block: Block = Globals.BLOCK_PREFAB.instantiate() + var block: Block = Block.PREFAB.instantiate() block.position = block_position block.set_id(id) blocks_container.add_child(block) func _create_dropped_block(id: String, start_position: Vector3, direction: Vector3 = Vector3.ZERO, velocity: float = 0.0) -> void: - var block: DroppedBlock = Globals.DROPPED_BLOCK_PREFAB.instantiate() + var block: DroppedBlock = DroppedBlock.PREFAB.instantiate() dropped_items_container.add_child(block) block.initialize(id, start_position, direction, velocity)