diff --git a/src/common/inventory.gd b/src/common/inventory.gd index 4987ed95bea5c5085069c0b668bd65db8732fb37..6468339761e1e0a07f4e55efc1d429577a960861 100644 --- a/src/common/inventory.gd +++ b/src/common/inventory.gd @@ -18,6 +18,8 @@ const ICONS: = { ItemTypes.GREEN_WAND: preload("res://assets/items/wand_green.atlastex"), } +const INVENTORY_PATH: = "user://inventory.tres" + ## Emitted when the count of a given item type changes. signal item_changed(type: ItemTypes) @@ -36,8 +38,8 @@ static func restore() -> Inventory: if Engine.is_editor_hint(): return null - if FileAccess.file_exists("user://"): - var inventory = ResourceLoader.load("user://") as Inventory + if FileAccess.file_exists(INVENTORY_PATH): + var inventory = ResourceLoader.load(INVENTORY_PATH) as Inventory if inventory: return inventory @@ -50,7 +52,7 @@ static func restore() -> Inventory: ## Increment the count of a given item by one, adding it to the inventory if it does not exist. func add(item_type: ItemTypes, amount: = 1) -> void: - # Note that adding negative numbers is possible. Prevent having negative items. + # Note that adding negative numbers is possible. Prevent having a total of negative items. # NPC: "You cannot have negative potatoes." var old_amount: = _items.get(item_type, 0) as int _items[item_type] = maxi(old_amount+amount, 0) @@ -77,4 +79,4 @@ static func get_item_icon(item_type: ItemTypes) -> Texture: ## Write the inventory contents to the disk. func save() -> void: - ResourceSaver.save(self, "user://") + ResourceSaver.save(self, INVENTORY_PATH) diff --git a/src/field/cutscenes/templates/pickups/pickup.tscn b/src/field/cutscenes/templates/pickups/pickup.tscn index 91bb721512f5aaf288641c10c02217dfe26b9c82..040ce15577bc3ea97b835cb82b3c7e3268ca61b5 100644 --- a/src/field/cutscenes/templates/pickups/pickup.tscn +++ b/src/field/cutscenes/templates/pickups/pickup.tscn @@ -12,7 +12,6 @@ amount = 1 [node name="Sprite2D" type="Sprite2D" parent="." index="1"] texture = ExtResource("3_1fedx") -offset = Vector2(0, -16) [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="2"] libraries = { diff --git a/src/main.tscn b/src/main.tscn index 47b2c7a42caa3c55b8349368844e15454fd9b4ea..2bfaa7af9ac860fb4537ecafc84b56d027f9e3ba 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -308,11 +308,12 @@ _data = { [sub_resource type="RectangleShape2D" id="RectangleShape2D_44b32"] size = Vector2(15, 15) -[node name="Gameboard" type="Node2D" node_paths=PackedStringArray("focused_game_piece")] +[node name="Gameboard" type="Node2D" node_paths=PackedStringArray("opening_cutscene", "focused_game_piece")] scale = Vector2(5, 5) script = ExtResource("2_bkxev") gamepiece_mask = 2 terrain_mask = 1 +opening_cutscene = NodePath("OpeningCutscene") focused_game_piece = NodePath("Terrain/Gamepieces/Player") gameboard = ExtResource("6_kd8tv") @@ -347,7 +348,7 @@ gameboard = ExtResource("6_kd8tv") y_sort_enabled = true [node name="Player" parent="Terrain/Gamepieces" instance=ExtResource("11_yntrj")] -position = Vector2(88.0001, 120) +position = Vector2(24, 200) gameboard = ExtResource("6_kd8tv") blocks_movement = true move_speed = 96.0