Skip to content

Commit 0c111a5

Browse files
committed
Remove profile from inventory, fix inventory filename is user directory
1 parent acc81bf commit 0c111a5

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/common/inventory.gd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ const ICONS: = {
1818
ItemTypes.GREEN_WAND: preload("res://assets/items/wand_green.atlastex"),
1919
}
2020

21+
const INVENTORY_PATH: = "user://inventory.tres"
22+
2123
## Emitted when the count of a given item type changes.
2224
signal item_changed(type: ItemTypes)
2325

@@ -36,8 +38,8 @@ static func restore() -> Inventory:
3638
if Engine.is_editor_hint():
3739
return null
3840

39-
if FileAccess.file_exists("user://"):
40-
var inventory = ResourceLoader.load("user://") as Inventory
41+
if FileAccess.file_exists(INVENTORY_PATH):
42+
var inventory = ResourceLoader.load(INVENTORY_PATH) as Inventory
4143
if inventory:
4244
return inventory
4345

@@ -50,7 +52,7 @@ static func restore() -> Inventory:
5052

5153
## Increment the count of a given item by one, adding it to the inventory if it does not exist.
5254
func add(item_type: ItemTypes, amount: = 1) -> void:
53-
# Note that adding negative numbers is possible. Prevent having negative items.
55+
# Note that adding negative numbers is possible. Prevent having a total of negative items.
5456
# NPC: "You cannot have negative potatoes."
5557
var old_amount: = _items.get(item_type, 0) as int
5658
_items[item_type] = maxi(old_amount+amount, 0)
@@ -77,4 +79,4 @@ static func get_item_icon(item_type: ItemTypes) -> Texture:
7779

7880
## Write the inventory contents to the disk.
7981
func save() -> void:
80-
ResourceSaver.save(self, "user://")
82+
ResourceSaver.save(self, INVENTORY_PATH)

src/field/cutscenes/templates/pickups/pickup.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ amount = 1
1212

1313
[node name="Sprite2D" type="Sprite2D" parent="." index="1"]
1414
texture = ExtResource("3_1fedx")
15-
offset = Vector2(0, -16)
1615

1716
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="2"]
1817
libraries = {

src/main.tscn

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,12 @@ _data = {
308308
[sub_resource type="RectangleShape2D" id="RectangleShape2D_44b32"]
309309
size = Vector2(15, 15)
310310

311-
[node name="Gameboard" type="Node2D" node_paths=PackedStringArray("focused_game_piece")]
311+
[node name="Gameboard" type="Node2D" node_paths=PackedStringArray("opening_cutscene", "focused_game_piece")]
312312
scale = Vector2(5, 5)
313313
script = ExtResource("2_bkxev")
314314
gamepiece_mask = 2
315315
terrain_mask = 1
316+
opening_cutscene = NodePath("OpeningCutscene")
316317
focused_game_piece = NodePath("Terrain/Gamepieces/Player")
317318
gameboard = ExtResource("6_kd8tv")
318319

@@ -347,7 +348,7 @@ gameboard = ExtResource("6_kd8tv")
347348
y_sort_enabled = true
348349

349350
[node name="Player" parent="Terrain/Gamepieces" instance=ExtResource("11_yntrj")]
350-
position = Vector2(88.0001, 120)
351+
position = Vector2(24, 200)
351352
gameboard = ExtResource("6_kd8tv")
352353
blocks_movement = true
353354
move_speed = 96.0

0 commit comments

Comments
 (0)