Merge branch 'main' into Shop

#Scenes/CardScrollUI.tscn

@@ -30,27 +30,26 @@ text = "Return"
 
 [node name="ScrollContainer" type="ScrollContainer" parent="."]
 layout_mode = 1
-offset_left = 561.0
-offset_top = 286.0
-offset_right = 1388.36
-offset_bottom = 699.205
+offset_left = 266.0
+offset_top = 94.0
+offset_right = 1766.0
+offset_bottom = 909.0
 
 [node name="GridContainer" type="GridContainer" parent="ScrollContainer"]
-custom_minimum_size = Vector2(186.475, 200)
-layout_direction = 1
+custom_minimum_size = Vector2(350, 470)
 layout_mode = 2
-size_flags_horizontal = 6
-size_flags_vertical = 6
+size_flags_horizontal = 4
+size_flags_vertical = 4
 theme_override_constants/h_separation = 20
-theme_override_constants/v_separation = 10
-columns = 5
+theme_override_constants/v_separation = 0
+columns = 4
 
 [node name="Label" type="Label" parent="."]
 layout_mode = 0
-offset_left = 842.0
-offset_top = 717.0
-offset_right = 1085.0
-offset_bottom = 775.0
+offset_left = 900.0
+offset_top = 923.0
+offset_right = 1143.0
+offset_bottom = 981.0
 text = "Showing "
 
 [connection signal="pressed" from="Button" to="." method="_on_button_pressed"]

#Scenes/Events/mob/0.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=3 uid="uid://sg1wi7uqvv25"]
+[gd_scene load_steps=16 format=3 uid="uid://sg1wi7uqvv25"]
 
 [ext_resource type="Script" path="res://#Scenes/SceneScripts/TestingScene.gd" id="1_nmgwp"]
 [ext_resource type="PackedScene" uid="uid://bcpmrmofcilbn" path="res://Core/Battler.tscn" id="2_e6pjn"]
@@ -13,17 +13,25 @@
 [ext_resource type="Texture2D" uid="uid://d4muqvs3etnr8" path="res://Art/Card_layout/discard_pile.png" id="12_0nlrw"]
 [ext_resource type="Script" path="res://UI/DiscardPileUISetter.gd" id="13_8nsar"]
 [ext_resource type="PackedScene" uid="uid://bam77cwf4emyr" path="res://#Scenes/TopBarOverlay.tscn" id="14_os5i4"]
+[ext_resource type="Texture2D" uid="uid://by65g3tjujc72" path="res://Art/Background/1-1.png" id="15_5h66l"]
 [ext_resource type="PackedScene" uid="uid://ruwidm3egyrx" path="res://#Scenes/xp_bar.tscn" id="15_r7cr8"]
 
 [node name="TestingScene" type="Node2D"]
 script = ExtResource("1_nmgwp")
 metadata/_edit_vertical_guides_ = [1216.0]
 
+[node name="Background" type="TextureRect" parent="."]
+custom_minimum_size = Vector2(1920, 1080)
+offset_right = 1920.0
+offset_bottom = 1080.0
+texture = ExtResource("15_5h66l")
+expand_mode = 1
+
 [node name="Battler" parent="." instance=ExtResource("2_e6pjn")]
-position = Vector2(896, 364)
+position = Vector2(893, 231)
 
 [node name="Player" parent="." instance=ExtResource("4_ss8ob")]
-position = Vector2(986, 631)
+position = Vector2(429, 677)
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
@@ -44,17 +52,21 @@ anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
+offset_left = -134.0
+offset_top = -280.0
+offset_right = -134.0
+offset_bottom = -280.0
 grow_horizontal = 2
 grow_vertical = 0
-starting_hand_size = 10
-max_hand_width = 900.0
+scale = Vector2(0.65, 0.65)
+max_hand_width = 1000.0
 min_card_separation = 90.0
 max_card_separation = 120.0
-hover_offset_max = 100.0
 max_rotation = 40.0
+max_hand_offset_y = 0.0
 draw_pile_ui = NodePath("../DrawPile")
 discard_pile_ui = NodePath("../DiscardPile")
-play_at_height = 500.0
+play_at_height = 800.0
 
 [node name="EndTurnButton" type="Button" parent="CanvasLayer/UIControl"]
 layout_mode = 1
@@ -171,6 +183,7 @@ main menu"
 
 [node name="TopBarOverlay" parent="CanvasLayer/UIControl" instance=ExtResource("14_os5i4")]
 layout_mode = 1
+offset_bottom = -987.0
 
 [node name="XP progress" parent="CanvasLayer/UIControl" instance=ExtResource("15_r7cr8")]
 layout_mode = 1

#Scenes/License.tscn

@@ -0,0 +1,102 @@
+[gd_scene load_steps=4 format=3 uid="uid://be5a748kcls0f"]
+
+[ext_resource type="Script" path="res://#Scenes/SceneScripts/license.gd" id="1_qwpco"]
+
+[sub_resource type="Gradient" id="Gradient_w1cvb"]
+colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_crixh"]
+gradient = SubResource("Gradient_w1cvb")
+
+[node name="Control" 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_qwpco")
+
+[node name="TextureRect" type="TextureRect" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource("GradientTexture2D_crixh")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 0
+offset_left = 55.0
+offset_right = 372.0
+offset_bottom = 121.0
+
+[node name="Godot Engine" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "Godot Engine"
+
+[node name="Dialogue Manager" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "Dialogue Manager"
+
+[node name="Smooth scroll" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "Smooth scroll"
+
+[node name="Free type" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "Free type"
+
+[node name="ENet" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "ENet"
+
+[node name="mbed TLS" type="Button" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 40
+text = "mbed TLS"
+
+[node name="License label" type="Label" parent="."]
+layout_mode = 1
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -1447.0
+offset_top = -1044.0
+offset_right = -47.0
+offset_bottom = -34.0
+grow_horizontal = 0
+grow_vertical = 0
+theme_override_font_sizes/font_size = 30
+text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam cursus ex at vulputate tincidunt. Praesent convallis augue ac nisi sollicitudin consectetur. Sed consequat consectetur vestibulum. Nulla elementum ex at neque porttitor, ut volutpat est lobortis. Suspendisse eget finibus lacus. Duis est neque, placerat sit amet odio et, placerat vehicula nisl. Praesent eu egestas leo. Maecenas quis sapien ullamcorper, aliquet ex sed, vestibulum libero. Nam in eros finibus, sagittis dui et, laoreet odio. Proin eros neque, ultricies et sagittis in, mattis in arcu. Morbi volutpat orci dui, eget tincidunt libero tempor quis. Quisque at arcu euismod purus blandit vehicula eget vitae mi. Morbi vel vehicula eros. "
+autowrap_mode = 2
+
+[node name="GoBack" type="Button" parent="."]
+layout_mode = 1
+anchors_preset = 2
+anchor_top = 1.0
+anchor_bottom = 1.0
+offset_left = 33.0
+offset_top = -241.0
+offset_right = 408.0
+offset_bottom = -19.0
+grow_vertical = 0
+theme_override_font_sizes/font_size = 60
+text = "Go back to 
+main menu"
+
+[connection signal="pressed" from="VBoxContainer/Godot Engine" to="." method="_on_godot_engine_pressed"]
+[connection signal="pressed" from="VBoxContainer/Dialogue Manager" to="." method="_on_dialogue_manager_pressed"]
+[connection signal="pressed" from="VBoxContainer/Smooth scroll" to="." method="_on_smooth_scroll_pressed"]
+[connection signal="pressed" from="VBoxContainer/Free type" to="." method="_on_free_type_pressed"]
+[connection signal="pressed" from="VBoxContainer/ENet" to="." method="_on_e_net_pressed"]
+[connection signal="pressed" from="VBoxContainer/mbed TLS" to="." method="_on_mbed_tls_pressed"]
+[connection signal="pressed" from="GoBack" to="." method="_on_go_back_pressed"]

#Scenes/MainMenu.tscn

@@ -96,7 +96,6 @@ layout_mode = 2
 size_flags_vertical = 3
 focus_neighbor_top = NodePath("../Options")
 focus_neighbor_bottom = NodePath("../Quit")
-disabled = true
 texture_normal = ExtResource("9_70yof")
 texture_hover = ExtResource("10_vce0e")
 texture_focused = ExtResource("10_vce0e")
@@ -126,5 +125,6 @@ cancel_button_text = "No"
 [connection signal="pressed" from="Menu buttons/Continue" to="." method="_on_continue_pressed"]
 [connection signal="pressed" from="Menu buttons/New game" to="." method="_on_start_pressed"]
 [connection signal="pressed" from="Menu buttons/Options" to="." method="_on_options_pressed"]
+[connection signal="pressed" from="Menu buttons/Credits" to="." method="_on_credits_pressed"]
 [connection signal="pressed" from="Menu buttons/Quit" to="." method="_on_quit_pressed"]
 [connection signal="confirmed" from="StartNewGameDialog" to="." method="_on_start_new_game_dialog_confirmed"]

#Scenes/OptionsMenu.tscn

@@ -34,4 +34,21 @@ grow_horizontal = 2
 grow_vertical = 2
 icon = ExtResource("1_a6abe")
 
+[node name="License" type="Button" parent="."]
+layout_mode = 1
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -423.0
+offset_top = -141.0
+offset_right = -70.0
+offset_bottom = -52.0
+grow_horizontal = 0
+grow_vertical = 0
+theme_override_font_sizes/font_size = 50
+text = "License"
+
 [connection signal="pressed" from="Back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="License" to="." method="_on_license_pressed"]

#Scenes/SceneScripts/MainMenu.gd

@@ -33,6 +33,7 @@ func _on_continue_pressed() -> void:
 		CardManager.load_data()
 		InventoryManager.load_inventory()
 		SceneManager.load_scene_data()
+		EnemyManager.load_data()
 
 func _on_button_hovered(button: TextureButton) -> void:
 	button.grab_focus()
@@ -47,6 +48,10 @@ func _on_quit_pressed() -> void:
 	get_tree().quit()
 
 
+## Go to the credits
+func _on_credits_pressed() -> void:
+	SceneManager.goto_scene("res://#Scenes/credits.tscn")
+
 func _on_start_new_game_dialog_confirmed() -> void:
 	SaveManager.clear_data()
 	_init_managers()

#Scenes/SceneScripts/OptionsMenu.gd

@@ -5,3 +5,7 @@ extends Control
 
 func _on_back_pressed() -> void:
 	SceneManager.goto_scene("res://#Scenes/MainMenu.tscn")
+
+
+func _on_license_pressed() -> void:
+	SceneManager.goto_scene("res://#Scenes/License.tscn")