Economy v2

.github/workflows/main-godot4.yml

@@ -37,14 +37,6 @@ jobs:
       max-parallel: 10
       matrix:
         include:
-          - os: ubuntu-latest
-            godot-version: '4.3'
-            godot-status: 'stable'
-            gdunit-version: 'v5.1'
-          - os: ubuntu-latest
-            godot-version: '4.4'
-            godot-status: 'stable'
-            gdunit-version: 'v5.1'
           - os: ubuntu-latest
             godot-version: '4.5'
             godot-status: 'stable'

Assets/godotfest_swag_shirt.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bpbaxw0vyursa"
+path="res://.godot/imported/godotfest_swag_shirt.png-8414ca085264c6db3e10a2f7cd68b762.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/godotfest_swag_shirt.png"
+dest_files=["res://.godot/imported/godotfest_swag_shirt.png-8414ca085264c6db3e10a2f7cd68b762.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

README.md

@@ -6,8 +6,6 @@
 
 
 [![Discord](https://img.shields.io/discord/1020665079668166677?color=rgb%2888%2C%20101%2C%20242%29&label=Discord&logo=discord)](https://discord.gg/7K7q2YuNXe)
-![Godot Version - 4.3](https://img.shields.io/badge/Godot_Version-4.3-2ea44f?logo=godotengine)
-![Godot Version - 4.4](https://img.shields.io/badge/Godot_Version-4.4-2ea44f?logo=godotengine)
 ![Godot Version - 4.5](https://img.shields.io/badge/Godot_Version-4.5-2ea44f?logo=godotengine)
 
 

Scenes/Economy.gd

@@ -0,0 +1,13 @@
+extends Control
+
+
+func _on_catalog_button_pressed() -> void:
+	SceneManager.goto_scene("res://Scenes/Economy/Catalog.tscn")
+
+
+func _on_inventory_button_pressed() -> void:
+	SceneManager.goto_scene("res://Scenes/Economy/Inventory.tscn")
+
+
+func _on_back_button_pressed() -> void:
+	SceneManager.goto_scene("res://Scenes/LoggedIn.tscn")

Scenes/Economy.gd.uid

@@ -0,0 +1 @@
+uid://vn8hsu4l0ml8

Scenes/Economy.tscn

@@ -0,0 +1,40 @@
+[gd_scene load_steps=2 format=3 uid="uid://csavdi738j7na"]
+
+[ext_resource type="Script" uid="uid://vn8hsu4l0ml8" path="res://Scenes/Economy.gd" id="1_ngxwe"]
+
+[node name="Economy" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_ngxwe")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Label" type="Label" parent="VBoxContainer"]
+layout_mode = 2
+text = "Economy V2"
+
+[node name="CatalogButton" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+text = "Catalog"
+
+[node name="InventoryButton" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+text = "Inventory"
+
+[node name="BackButton" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+text = "Back to Main Menu"
+
+[connection signal="pressed" from="VBoxContainer/CatalogButton" to="." method="_on_catalog_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/InventoryButton" to="." method="_on_inventory_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/BackButton" to="." method="_on_back_button_pressed"]

Scenes/Economy/Catalog.gd

@@ -0,0 +1,30 @@
+extends Control
+
+@onready var card_scene: PackedScene = preload("res://Scenes/Widgets/ItemCard.tscn")
+
+func _ready() -> void:
+	%LoadingIndicator.show()
+	PlayFabManager.catalog.search_complete.connect(_on_search_complete)
+	if PlayFabManager.catalog._has_full_catalog:
+		_on_search_complete()
+	else:
+		PlayFabManager.catalog.fetch_catalog()
+
+
+func _on_search_complete() -> void:
+	var catalog := PlayFabManager.catalog.get_catalog()
+	for key in catalog:
+		var catalog_item: CatalogItem = catalog[key]
+		var card: ItemCard = card_scene.instantiate()
+		card.reset(catalog_item)
+		if catalog_item.Type == CatalogItem.TYPE_CURRENCY:
+			%LoadingIndicator.hide()
+			%CurrencyCardGridContainer.add_child(card)
+		else:
+			%LoadingIndicator.hide()
+			%ItemCardGridContainer.add_child(card)
+
+
+
+func _on_back_button_pressed() -> void:
+	SceneManager.goto_scene("res://Scenes/Economy.tscn")

Scenes/Economy/Catalog.gd.uid

@@ -0,0 +1 @@
+uid://cvn4peu38pqpe

Scenes/Economy/Catalog.tscn

@@ -0,0 +1,99 @@
+[gd_scene load_steps=3 format=3 uid="uid://cq24viuorfsjc"]
+
+[ext_resource type="Script" uid="uid://cvn4peu38pqpe" path="res://Scenes/Economy/Catalog.gd" id="1_lnqhp"]
+[ext_resource type="PackedScene" uid="uid://wwvhjjuojn77" path="res://Scenes/Widgets/LoadingIndicator.tscn" id="2_8nk0b"]
+
+[node name="Catalog" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 6
+size_flags_vertical = 6
+script = ExtResource("1_lnqhp")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_bottom = -46.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Header" type="Label" parent="VBoxContainer"]
+layout_mode = 2
+text = "Catalog"
+
+[node name="HSeparator" type="HSeparator" parent="VBoxContainer"]
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 2
+
+[node name="TabContainer" type="TabContainer" parent="VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+current_tab = 0
+
+[node name="Items" type="TabBar" parent="VBoxContainer/TabContainer"]
+layout_mode = 2
+metadata/_tab_index = 0
+
+[node name="ItemCardGridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Items"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(100, 100)
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_vertical = 3
+columns = 4
+
+[node name="Currencies" type="TabBar" parent="VBoxContainer/TabContainer"]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 1
+
+[node name="CurrencyCardGridContainer" type="GridContainer" parent="VBoxContainer/TabContainer/Currencies"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(100, 100)
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_vertical = 3
+columns = 4
+
+[node name="BackButton" type="Button" parent="."]
+layout_mode = 1
+anchors_preset = 12
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -29.0
+grow_horizontal = 2
+grow_vertical = 0
+text = "Back to Economy"
+
+[node name="ProgressCenter" type="CenterContainer" parent="."]
+custom_minimum_size = Vector2(100, 100)
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="LoadingIndicator" parent="ProgressCenter" instance=ExtResource("2_8nk0b")]
+unique_name_in_owner = true
+visible = false
+custom_minimum_size = Vector2(100, 100)
+layout_mode = 2
+
+[connection signal="pressed" from="BackButton" to="." method="_on_back_button_pressed"]

Scenes/Economy/Inventory.gd

@@ -0,0 +1,51 @@
+extends Control
+
+@onready var card_scene: PackedScene = preload("res://Scenes/Widgets/ItemCard.tscn")
+
+var inventory_items: Array = []
+
+func _ready() -> void:
+	_update_inventory()
+
+func _update_inventory() -> void:
+	%LoadingIndicator.show()
+
+	var catalog: Dictionary[String, CatalogItem] = PlayFabManager.catalog.get_catalog()
+	var inventory: Dictionary[String, InventoryItem] = PlayFabManager.inventory.get_inventory()
+	for id in inventory:
+		var inventory_item: InventoryItem = inventory[id]
+		var catalog_item: CatalogItem = resolve_catalog_item(inventory_item.Id, catalog)
+		var card: ItemCard = card_scene.instantiate()
+		card.reset_inventory(catalog_item, inventory_item)
+
+		if inventory_item.Type == CatalogItem.TYPE_CURRENCY:
+			%CurrencyCardGridContainer.add_child(card)
+		else:
+			%ItemCardGridContainer.add_child(card)
+
+
+	%LoadingIndicator.hide()
+
+func _clear_inventory() -> void:
+	for child in %CurrencyCardGridContainer.get_children():
+		%CurrencyCardGridContainer.remove_child(child)
+		child.queue_free()
+
+	for child in %ItemCardGridContainer.get_children():
+		%ItemCardGridContainer.remove_child(child)
+		child.queue_free()
+
+func resolve_catalog_item(item_id: String, catalog: Dictionary[String, CatalogItem]) -> CatalogItem:
+	var item = catalog.get(item_id, CatalogItem.new())
+	return item
+
+func _on_back_button_pressed() -> void:
+	SceneManager.goto_scene("res://Scenes/Economy.tscn")
+
+
+func _on_referesh_button_pressed() -> void:
+	%LoadingIndicator.show()
+	_clear_inventory()
+	PlayFabManager.inventory.turboload_inventory(func():
+		_update_inventory()
+	)

Scenes/Economy/Inventory.gd.uid

@@ -0,0 +1 @@
+uid://bdlfoyj3jgt24