Merge branch 'main' of github.com:MarcEricMartel/Game-Jam-A23

Scenes/ending.tscn

@@ -659,7 +659,7 @@ size_flags_horizontal = 3
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="TotalArmyComp/Separation/ArmyTotals/Bats/Control"]
 position = Vector2(24, 18)
 sprite_frames = SubResource("SpriteFrames_kjfbi")
-frame_progress = 0.259297
+frame_progress = 0.806293
 
 [node name="2Points" type="Label" parent="TotalArmyComp/Separation/ArmyTotals/Bats"]
 layout_mode = 2
@@ -687,7 +687,7 @@ size_flags_horizontal = 3
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="TotalArmyComp/Separation/ArmyTotals/Wolves/Control"]
 position = Vector2(24, 16)
 sprite_frames = SubResource("SpriteFrames_h2asb")
-frame_progress = 0.261149
+frame_progress = 0.808144
 
 [node name="2Points" type="Label" parent="TotalArmyComp/Separation/ArmyTotals/Wolves"]
 layout_mode = 2
@@ -715,7 +715,7 @@ size_flags_horizontal = 3
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="TotalArmyComp/Separation/ArmyTotals/Necromancers/Control"]
 position = Vector2(24, 22)
 sprite_frames = SubResource("SpriteFrames_0hwvy")
-frame_progress = 0.676531
+frame_progress = 0.223527
 
 [node name="2Points" type="Label" parent="TotalArmyComp/Separation/ArmyTotals/Necromancers"]
 layout_mode = 2
@@ -743,7 +743,7 @@ size_flags_horizontal = 3
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="TotalArmyComp/Separation/ArmyTotals/Pit Fiends/Control"]
 position = Vector2(24, 22)
 sprite_frames = SubResource("SpriteFrames_3y7oi")
-frame_progress = 0.890332
+frame_progress = 0.437328
 
 [node name="2Points" type="Label" parent="TotalArmyComp/Separation/ArmyTotals/Pit Fiends"]
 layout_mode = 2
@@ -823,7 +823,7 @@ flip_h = true
 position = Vector2(784, 288)
 scale = Vector2(7.765, 7.765)
 sprite_frames = SubResource("SpriteFrames_5yana")
-frame_progress = 0.36378
+frame_progress = 0.910776
 flip_h = true
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]

Scenes/start_menu.tscn

@@ -1,9 +1,13 @@
-[gd_scene load_steps=3 format=3 uid="uid://bkt0gdgv7bsx2"]
+[gd_scene load_steps=6 format=3 uid="uid://bkt0gdgv7bsx2"]
 
 [ext_resource type="Script" path="res://Scripts/start_menu.gd" id="1_dgae7"]
+[ext_resource type="PackedScene" uid="uid://b8s2seg2lf7wo" path="res://Scenes/Tilemaps/tileset_1.tscn" id="2_0sfou"]
+[ext_resource type="Theme" uid="uid://dr1h7to56a2pv" path="res://Themes/base_theme.tres" id="3_puxi3"]
+[ext_resource type="Texture2D" uid="uid://cxk21atb8fblp" path="res://Assets/Witch/noBKG_WitchThrow_strip.png" id="4_qq6xh"]
 
-[sub_resource type="LabelSettings" id="LabelSettings_7r5ov"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_je3v2"]
-font_size = 69
+atlas = ExtResource("4_qq6xh")
+region = Rect2(1024, 0, 64, 64)
 
 [node name="StartMenu" type="Control"]
 layout_mode = 3
@@ -14,34 +18,75 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_dgae7")
 
-[node name="Title" type="Label" parent="."]
+[node name="TileSet1" parent="." instance=ExtResource("2_0sfou")]
-layout_mode = 0
+
-offset_left = 260.0
+[node name="ColorRect" type="ColorRect" parent="."]
-offset_top = 95.0
+layout_mode = 1
-offset_right = 910.0
+anchors_preset = 15
-offset_bottom = 389.0
+anchor_right = 1.0
-text = "UNTITLED GAME
+anchor_bottom = 1.0
-THAT MAY BE 
+grow_horizontal = 2
-ABOUT A MONSTER"
+grow_vertical = 2
-label_settings = SubResource("LabelSettings_7r5ov")
+color = Color(0.6, 0.117647, 0.407843, 0.215686)
-horizontal_alignment = 1
 
 [node name="StartButton" type="Button" parent="."]
-layout_mode = 0
+layout_mode = 1
-offset_left = 420.0
+anchors_preset = 2
-offset_top = 442.0
+anchor_top = 1.0
-offset_right = 558.0
+anchor_bottom = 1.0
-offset_bottom = 489.0
+offset_left = 304.0
+offset_top = -92.0
+offset_right = 442.0
+offset_bottom = -45.0
+grow_vertical = 0
 text = "Start"
 
 [node name="QuitButton" type="Button" parent="."]
-layout_mode = 0
+layout_mode = 1
-offset_left = 570.0
+anchors_preset = 3
-offset_top = 442.0
+anchor_left = 1.0
-offset_right = 705.0
+anchor_top = 1.0
-offset_bottom = 489.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -440.0
+offset_top = -92.0
+offset_right = -305.0
+offset_bottom = -45.0
+grow_horizontal = 0
+grow_vertical = 0
 text = "Quit
 "
 
+[node name="Title" type="Label" parent="."]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -41.0
+offset_top = 120.0
+offset_right = 41.0
+offset_bottom = 146.0
+grow_horizontal = 2
+theme = ExtResource("3_puxi3")
+theme_override_colors/font_color = Color(0.635294, 0.0352941, 0.121569, 1)
+theme_override_colors/font_shadow_color = Color(0.278431, 0, 0.0235294, 1)
+theme_override_colors/font_outline_color = Color(0.6, 0, 0, 0.631373)
+theme_override_font_sizes/font_size = 72
+text = "Blud Mage"
+
+[node name="Image" type="TextureRect" parent="Title"]
+layout_mode = 1
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -120.0
+offset_top = 56.0
+offset_right = 136.0
+offset_bottom = 312.0
+grow_horizontal = 2
+texture = SubResource("AtlasTexture_je3v2")
+expand_mode = 2
+stretch_mode = 5
+
 [connection signal="pressed" from="StartButton" to="." method="_on_start_button_pressed"]
 [connection signal="pressed" from="QuitButton" to="." method="_on_quit_button_pressed"]