diff --git a/Fonts/breathe_fire/Breathe Fire.otf.import b/Fonts/breathe_fire/Breathe Fire.otf.import index 53a6044..c06d01d 100644 --- a/Fonts/breathe_fire/Breathe Fire.otf.import +++ b/Fonts/breathe_fire/Breathe Fire.otf.import @@ -27,7 +27,13 @@ Fallbacks=null fallbacks=[] Compress=null compress=true -preload=[] +preload=[{ +"chars": [], +"glyphs": [], +"name": "New Configuration", +"size": Vector2i(16, 0), +"variation_embolden": 0.0 +}] language_support={} script_support={} opentype_features={} diff --git a/Materials/UIParticles.tres b/Materials/UIParticles.tres new file mode 100644 index 0000000..b7a8550 --- /dev/null +++ b/Materials/UIParticles.tres @@ -0,0 +1,7 @@ +[gd_resource type="CanvasItemMaterial" format=3 uid="uid://cj3j7plf3uvof"] + +[resource] +particles_animation = true +particles_anim_h_frames = 9 +particles_anim_v_frames = 9 +particles_anim_loop = false diff --git a/Materials/UIParticlesProcess.tres b/Materials/UIParticlesProcess.tres new file mode 100644 index 0000000..d55a250 --- /dev/null +++ b/Materials/UIParticlesProcess.tres @@ -0,0 +1,21 @@ +[gd_resource type="ParticleProcessMaterial" load_steps=3 format=3 uid="uid://bwbh4n1f02php"] + +[sub_resource type="Curve" id="Curve_4skk8"] +_data = [Vector2(0, 0), 0.0, 3.2967, 0, 0, Vector2(0.226667, 1), -0.400951, -0.400951, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_ss1xk"] +curve = SubResource("Curve_4skk8") + +[resource] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 diff --git a/Resources/Playlists/arena.tres b/Resources/Playlists/arena.tres index 97986d4..0d84a87 100644 --- a/Resources/Playlists/arena.tres +++ b/Resources/Playlists/arena.tres @@ -4,4 +4,4 @@ [resource] script = ExtResource("1_kyxgb") -music = Array[String](["res://Sound/Music/Achievement.mp3"]) +music = Array[String](["res://Sound/Music/Achievement.mp3", "res://Sound/Music/pirate-tavern-full-version-167990.mp3", "res://Sound/Music/fight-for-your-rights-13529.mp3"]) diff --git a/Resources/Playlists/mainMenu.tres b/Resources/Playlists/mainMenu.tres index 28a61d0..4074b32 100644 --- a/Resources/Playlists/mainMenu.tres +++ b/Resources/Playlists/mainMenu.tres @@ -4,4 +4,4 @@ [resource] script = ExtResource("1_4ivkm") -music = Array[String](["res://Sound/Music/Borgar.ogg", "res://Sound/Music/Wanderer.mp3"]) +music = Array[String](["res://Sound/Music/Wanderer.ogg", "res://Sound/Music/Borgar.ogg"]) diff --git a/Scenes/UI/mainMenu.tscn b/Scenes/UI/mainMenu.tscn index d36c74e..966165b 100644 --- a/Scenes/UI/mainMenu.tscn +++ b/Scenes/UI/mainMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cme8avdi3w0sg"] +[gd_scene load_steps=22 format=3 uid="uid://cme8avdi3w0sg"] [ext_resource type="Texture2D" uid="uid://s86ux2sxmlff" path="res://Sprites/Backgrounds/Castle Pack by CaptainSkeleto/castle pack5.png" id="1_7mj66"] [ext_resource type="FontFile" uid="uid://bhggfnolqg5hu" path="res://Fonts/breathe_fire/Breathe Fire.otf" id="2_0dtno"] @@ -7,10 +7,98 @@ [ext_resource type="Texture2D" uid="uid://cakcdmbrg18pl" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu/Menu (10).png" id="3_13m7d"] [ext_resource type="Texture2D" uid="uid://bc2xelxdfct7m" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (2).png" id="5_ugt05"] [ext_resource type="Texture2D" uid="uid://cyf8re8ysh5yy" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (19).png" id="6_y4hvi"] +[ext_resource type="PackedScene" uid="uid://c2tdawo5x8o16" path="res://Scenes/UI/ui_particles.tscn" id="7_cscky"] [ext_resource type="Texture2D" uid="uid://blydsiai2vc7g" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (15).png" id="7_l7447"] [ext_resource type="Texture2D" uid="uid://cl0ommmgyxd6l" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (32).png" id="8_pax86"] [ext_resource type="Texture2D" uid="uid://c678lemibfpux" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (7).png" id="9_pbom3"] [ext_resource type="Texture2D" uid="uid://sx01p5y3lrwr" path="res://Sprites/UI/Edinnu_UI_asset_pack/Menu_buttons/Menu_button (24).png" id="10_vqgbn"] +[ext_resource type="Texture2D" uid="uid://by5jvj8x2d776" path="res://Sprites/UI/Edinnu_UI_asset_pack/Dialogue_plates/Plate (44).png" id="14_sxjd6"] + +[sub_resource type="GDScript" id="GDScript_felhp"] +script/source = "extends Control + +@export var test: int + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta) -> void: + pass +" + +[sub_resource type="Curve" id="Curve_4skk8"] +_data = [Vector2(0, 0), 0.0, 3.2967, 0, 0, Vector2(0.226667, 1), -0.400951, -0.400951, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_ss1xk"] +curve = SubResource("Curve_4skk8") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_flsys"] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gig2t"] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_qfys1"] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_1gsvf"] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_y8xc4"] +particle_flag_disable_z = true +emission_shape = 3 +emission_box_extents = Vector3(1, 1, 1) +gravity = Vector3(0, 0, 0) +linear_accel_min = 100.0 +linear_accel_max = 100.0 +scale_min = 0.5 +scale_max = 0.75 +scale_curve = SubResource("CurveTexture_ss1xk") +anim_speed_min = 1.0 +anim_speed_max = 1.0 [node name="MainMenu" type="Control"] layout_mode = 3 @@ -31,12 +119,24 @@ texture = ExtResource("1_7mj66") expand_mode = 2 stretch_mode = 6 -[node name="TitleScreen" type="Node" parent="."] +[node name="TitleScreen" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("2_3k665") -[node name="Title" type="Node" parent="TitleScreen"] +[node name="Title" type="Control" parent="TitleScreen"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +grow_horizontal = 2 [node name="Your" type="RichTextLabel" parent="TitleScreen/Title"] +layout_mode = 1 anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 @@ -52,8 +152,10 @@ theme_override_constants/shadow_outline_size = 5 theme_override_fonts/normal_font = ExtResource("2_0dtno") theme_override_font_sizes/normal_font_size = 190 text = "Your" +script = SubResource("GDScript_felhp") [node name="Raise" type="RichTextLabel" parent="TitleScreen/Title"] +layout_mode = 1 anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 @@ -70,8 +172,10 @@ theme_override_constants/shadow_outline_size = 5 theme_override_fonts/normal_font = ExtResource("2_0dtno") theme_override_font_sizes/normal_font_size = 200 text = "Raise" +script = SubResource("GDScript_felhp") [node name="Wand" type="RichTextLabel" parent="TitleScreen/Title"] +layout_mode = 1 anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 @@ -89,6 +193,7 @@ theme_override_font_sizes/normal_font_size = 270 text = "Wand" [node name="Disclaimer" type="RichTextLabel" parent="TitleScreen/Title"] +layout_mode = 1 anchors_preset = 5 anchor_left = 0.5 anchor_right = 0.5 @@ -105,10 +210,17 @@ theme_override_fonts/normal_font = ExtResource("2_0dtno") theme_override_font_sizes/normal_font_size = 100 text = "*Wands not included" -[node name="Buttons" type="Node" parent="TitleScreen"] +[node name="Buttons" type="Control" parent="TitleScreen"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="Play" type="TextureButton" parent="TitleScreen/Buttons"] modulate = Color(1, 0.972549, 0.811765, 1) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -145,8 +257,14 @@ theme_override_font_sizes/normal_font_size = 69 bbcode_enabled = true text = "[center]Play[/center]" +[node name="UIParticles" parent="TitleScreen/Buttons/Play" instance=ExtResource("7_cscky")] +position = Vector2(50, 20) +process_material = SubResource("ParticleProcessMaterial_flsys") +size = Vector3(50, 10, 0.1) + [node name="Credits" type="TextureButton" parent="TitleScreen/Buttons"] modulate = Color(1, 0.972549, 0.811765, 1) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -183,8 +301,14 @@ theme_override_font_sizes/normal_font_size = 69 bbcode_enabled = true text = "[center]Credits[/center]" +[node name="UIParticles" parent="TitleScreen/Buttons/Credits" instance=ExtResource("7_cscky")] +position = Vector2(50, 20) +process_material = SubResource("ParticleProcessMaterial_gig2t") +size = Vector3(50, 10, 0.1) + [node name="Settings" type="TextureButton" parent="TitleScreen/Buttons"] modulate = Color(1, 0.972549, 0.811765, 1) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -201,8 +325,14 @@ pivot_offset = Vector2(14.5, 14.5) texture_normal = ExtResource("5_ugt05") texture_pressed = ExtResource("6_y4hvi") +[node name="UIParticles" parent="TitleScreen/Buttons/Settings" instance=ExtResource("7_cscky")] +position = Vector2(14.75, 15.25) +process_material = SubResource("ParticleProcessMaterial_qfys1") +size = Vector3(10, 10, 0.1) + [node name="Quit" type="TextureButton" parent="TitleScreen/Buttons"] modulate = Color(1, 0.972549, 0.811765, 1) +layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 @@ -219,15 +349,108 @@ pivot_offset = Vector2(14.5, 14.5) texture_normal = ExtResource("7_l7447") texture_pressed = ExtResource("8_pax86") +[node name="UIParticles" parent="TitleScreen/Buttons/Quit" instance=ExtResource("7_cscky")] +position = Vector2(14.75, 15.25) +process_material = SubResource("ParticleProcessMaterial_1gsvf") +size = Vector3(10, 10, 0.1) + [node name="About" type="TextureButton" parent="TitleScreen/Buttons"] modulate = Color(1, 0.972549, 0.811765, 1) -offset_top = 7.0 +layout_mode = 1 +offset_top = 12.0 offset_right = 30.0 -offset_bottom = 41.0 +offset_bottom = 46.0 scale = Vector2(2, 2) texture_normal = ExtResource("9_pbom3") texture_pressed = ExtResource("10_vqgbn") -[node name="Settings" type="Node" parent="."] +[node name="UIParticles" parent="TitleScreen/Buttons/About" instance=ExtResource("7_cscky")] +position = Vector2(14, 15) +process_material = SubResource("ParticleProcessMaterial_y8xc4") +size = Vector3(10, 10, 0.1) + +[node name="Settings" type="Control" parent="."] +visible = false +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="NinePatchRect" type="NinePatchRect" parent="Settings"] +layout_mode = 1 +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -65.5 +offset_top = -49.5 +offset_right = 65.5 +offset_bottom = 49.5 +grow_horizontal = 2 +grow_vertical = 2 +scale = Vector2(5, 5) +pivot_offset = Vector2(65.5, 51.42) +texture = ExtResource("14_sxjd6") +patch_margin_left = 8 +patch_margin_top = 9 +patch_margin_right = 8 +patch_margin_bottom = 6 + +[node name="ScrollContainer" type="ScrollContainer" parent="Settings/NinePatchRect"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 8.0 +offset_top = 9.0 +offset_right = -8.0 +offset_bottom = -6.0 +grow_horizontal = 2 +grow_vertical = 2 +follow_focus = true +horizontal_scroll_mode = 0 + +[node name="VBoxContainer" type="VBoxContainer" parent="Settings/NinePatchRect/ScrollContainer"] +custom_minimum_size = Vector2(100, 20) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +alignment = 1 + +[node name="RichTextLabel" type="RichTextLabel" parent="Settings/NinePatchRect/ScrollContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 30) +layout_mode = 2 +theme_override_fonts/normal_font = ExtResource("2_0dtno") +theme_override_font_sizes/normal_font_size = 20 +text = "Settings" + +[node name="RichTextLabel2" type="RichTextLabel" parent="Settings/NinePatchRect/ScrollContainer/VBoxContainer"] +layout_mode = 2 +text = "aaaa" + +[node name="RichTextLabel3" type="RichTextLabel" parent="Settings/NinePatchRect/ScrollContainer/VBoxContainer"] +layout_mode = 2 +text = "eeeeeeeeeeee" [node name="Credits" type="Node" parent="."] + +[connection signal="mouse_entered" from="TitleScreen/Buttons/Play" to="TitleScreen/Buttons/Play/UIParticles" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="TitleScreen/Buttons/Play" to="TitleScreen/Buttons/Play/UIParticles" method="_on_mouse_exited"] +[connection signal="pressed" from="TitleScreen/Buttons/Play" to="TitleScreen" method="_on_play_pressed"] +[connection signal="mouse_entered" from="TitleScreen/Buttons/Credits" to="TitleScreen/Buttons/Credits/UIParticles" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="TitleScreen/Buttons/Credits" to="TitleScreen/Buttons/Credits/UIParticles" method="_on_mouse_exited"] +[connection signal="pressed" from="TitleScreen/Buttons/Credits" to="TitleScreen" method="_on_credits_pressed"] +[connection signal="mouse_entered" from="TitleScreen/Buttons/Settings" to="TitleScreen/Buttons/Settings/UIParticles" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="TitleScreen/Buttons/Settings" to="TitleScreen/Buttons/Settings/UIParticles" method="_on_mouse_exited"] +[connection signal="pressed" from="TitleScreen/Buttons/Settings" to="TitleScreen" method="_on_settings_pressed"] +[connection signal="mouse_entered" from="TitleScreen/Buttons/Quit" to="TitleScreen/Buttons/Quit/UIParticles" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="TitleScreen/Buttons/Quit" to="TitleScreen/Buttons/Quit/UIParticles" method="_on_mouse_exited"] +[connection signal="pressed" from="TitleScreen/Buttons/Quit" to="TitleScreen" method="_on_quit_pressed"] +[connection signal="mouse_entered" from="TitleScreen/Buttons/About" to="TitleScreen/Buttons/About/UIParticles" method="_on_mouse_entered"] +[connection signal="mouse_exited" from="TitleScreen/Buttons/About" to="TitleScreen/Buttons/About/UIParticles" method="_on_mouse_exited"] +[connection signal="pressed" from="TitleScreen/Buttons/About" to="TitleScreen" method="_on_about_pressed"] diff --git a/Scenes/UI/ui_particles.tscn b/Scenes/UI/ui_particles.tscn new file mode 100644 index 0000000..ca21010 --- /dev/null +++ b/Scenes/UI/ui_particles.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=5 format=3 uid="uid://c2tdawo5x8o16"] + +[ext_resource type="Material" uid="uid://cj3j7plf3uvof" path="res://Materials/UIParticles.tres" id="1_wybxw"] +[ext_resource type="Material" uid="uid://bwbh4n1f02php" path="res://Materials/UIParticlesProcess.tres" id="2_0jh3f"] +[ext_resource type="Texture2D" uid="uid://op5xs1c6o0ec" path="res://Sprites/Particles/Particles Cleaned/4_casting_spritesheet.png" id="3_gxd3t"] +[ext_resource type="Script" path="res://Scripts/Animations/uiParticles.gd" id="4_58iux"] + +[node name="UIParticles" type="GPUParticles2D"] +z_index = 10 +z_as_relative = false +material = ExtResource("1_wybxw") +emitting = false +amount = 7 +process_material = ExtResource("2_0jh3f") +texture = ExtResource("3_gxd3t") +script = ExtResource("4_58iux") +size = Vector3(50, 50, 0.1) diff --git a/Scenes/arena.tscn b/Scenes/arena.tscn index dccec9f..b3af8d9 100644 --- a/Scenes/arena.tscn +++ b/Scenes/arena.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=9 format=3 uid="uid://fgo2hd37towj"] +[gd_scene load_steps=8 format=3 uid="uid://fgo2hd37towj"] -[ext_resource type="PackedScene" uid="uid://d2owoq5q27v8q" path="res://Scenes/data.tscn" id="1_cjr1k"] [ext_resource type="PackedScene" uid="uid://nckxh4vysmvv" path="res://Scenes/player_controller.tscn" id="2_ud5et"] [ext_resource type="PackedScene" uid="uid://c8wwq1hoj4sd5" path="res://Scenes/Characters/wizard.tscn" id="3_arqpv"] [ext_resource type="Resource" uid="uid://bxtiv2esuer8v" path="res://Resources/Spellbooks/oldBook.tres" id="4_3cleg"] @@ -11,9 +10,6 @@ [node name="Arena" type="Node2D"] -[node name="Data" parent="." instance=ExtResource("1_cjr1k")] -spellbook = ExtResource("4_3cleg") - [node name="PlayerController" parent="." node_paths=PackedStringArray("avatar") instance=ExtResource("2_ud5et")] avatar = NodePath("../Wizard") @@ -62,3 +58,6 @@ offset_left = 1177.0 offset_top = 204.5 offset_right = 1177.0 offset_bottom = 204.5 + +[connection signal="healthChanged" from="Wizard" to="Wizard/HealthBar" method="healthChanged"] +[connection signal="healthChanged" from="Wizard2" to="Wizard2/HealthBar" method="healthChanged"] diff --git a/Scenes/musicPlayer.tscn b/Scenes/musicPlayer.tscn index 8578404..c93adc2 100644 --- a/Scenes/musicPlayer.tscn +++ b/Scenes/musicPlayer.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" path="res://Scripts/musicPlayer.gd" id="1_7oew4"] [node name="MusicPlayer" type="AudioStreamPlayer"] +bus = &"Music" script = ExtResource("1_7oew4") [connection signal="finished" from="." to="." method="_onSongFinished"] diff --git a/Scenes/root.tscn b/Scenes/root.tscn index 51ad0a0..d313dcd 100644 --- a/Scenes/root.tscn +++ b/Scenes/root.tscn @@ -1,16 +1,18 @@ -[gd_scene load_steps=5 format=3 uid="uid://bix346il46rme"] +[gd_scene load_steps=6 format=3 uid="uid://bix346il46rme"] [ext_resource type="PackedScene" uid="uid://c8ni0t7brphc7" path="res://Scenes/musicPlayer.tscn" id="1_60q85"] [ext_resource type="PackedScene" uid="uid://d2owoq5q27v8q" path="res://Scenes/data.tscn" id="2_ba8tb"] [ext_resource type="PackedScene" uid="uid://cme8avdi3w0sg" path="res://Scenes/UI/mainMenu.tscn" id="3_vjpnb"] +[ext_resource type="Resource" uid="uid://bxtiv2esuer8v" path="res://Resources/Spellbooks/oldBook.tres" id="4_vnce4"] [sub_resource type="AudioStream" id="AudioStream_ibb28"] [node name="Root" type="Node"] +[node name="MainMenu" parent="." instance=ExtResource("3_vjpnb")] + [node name="MusicPlayer" parent="." instance=ExtResource("1_60q85")] stream = SubResource("AudioStream_ibb28") [node name="Data" parent="." instance=ExtResource("2_ba8tb")] - -[node name="MainMenu" parent="." instance=ExtResource("3_vjpnb")] +spellbook = ExtResource("4_vnce4") diff --git a/Scripts/Animations/uiParticles.gd b/Scripts/Animations/uiParticles.gd new file mode 100644 index 0000000..4f18819 --- /dev/null +++ b/Scripts/Animations/uiParticles.gd @@ -0,0 +1,17 @@ +extends GPUParticles2D + +@export var size: Vector3 + +# Called when the node enters the scene tree for the first time. +func _ready(): + process_material.emission_box_extents = size + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _on_mouse_entered(): + emitting = true + +func _on_mouse_exited(): + emitting = false diff --git a/Scripts/TitleScreen.gd b/Scripts/TitleScreen.gd index b0bbf32..75030f4 100644 --- a/Scripts/TitleScreen.gd +++ b/Scripts/TitleScreen.gd @@ -1,4 +1,4 @@ -extends Node +extends Control @onready var raise: RichTextLabel = $Title/Raise @onready var your: RichTextLabel = $Title/Your @@ -19,24 +19,17 @@ func _ready(): func _process(delta): pass -func hide(): - raise.hide() - your.hide() - wand.hide() - disclaimer.hide() - play.hide() - credits.hide() - settings.hide() - quit.hide() - about.hide() +func _on_play_pressed(): + print("Play") -func show(): - raise.show() - your.show() - wand.show() - disclaimer.show() - play.show() - credits.show() - settings.show() - quit.show() - about.show() +func _on_credits_pressed(): + print("Credits") + +func _on_settings_pressed(): + print("Settings") + +func _on_about_pressed(): + print("About") + +func _on_quit_pressed(): + get_tree().quit() diff --git a/Scripts/castIndicator.gd b/Scripts/castIndicator.gd index 8d69efd..a901767 100644 --- a/Scripts/castIndicator.gd +++ b/Scripts/castIndicator.gd @@ -2,7 +2,7 @@ extends Control class_name CastIndicator -@onready var data = get_node("/root/Arena/Data") +@onready var data = get_node("/root/Root/Data") @onready var primaryBox = $border @onready var secondaryBox = $border2 diff --git a/Scripts/combatant.gd b/Scripts/combatant.gd index 5668c09..7550e88 100644 --- a/Scripts/combatant.gd +++ b/Scripts/combatant.gd @@ -4,7 +4,7 @@ signal healthChanged(health: float) @onready var renderer: AnimatedSprite2D = $AnimatedSprite2D @onready var healthbar: HealthBar = $HealthBar -@onready var data: Data = get_node("/root/Arena/Data") +@onready var data: Data = get_node("/root/Root/Data") @export var spellbook: Spellbook @export var maxHealth: float = 10 diff --git a/Scripts/playerController.gd b/Scripts/playerController.gd index 7a6f991..66c9b29 100644 --- a/Scripts/playerController.gd +++ b/Scripts/playerController.gd @@ -1,7 +1,7 @@ extends Node -@onready var data: Data = get_node("/root/Arena/Data") -@onready var castIndicator: CastIndicator = get_node("/root/Arena/CastIndicator") +@onready var data: Data = get_node("/root/Root/Data") +@onready var castIndicator: CastIndicator = get_node("/root/Root/Arena/CastIndicator") @export var avatar: Combatant var casting = false var spell: Spell diff --git a/Sound/Music/Wanderer.mp3 b/Sound/Music/Wanderer.mp3 deleted file mode 100644 index f11f669..0000000 Binary files a/Sound/Music/Wanderer.mp3 and /dev/null differ diff --git a/Sound/Music/Wanderer.mp3.import b/Sound/Music/Wanderer.mp3.import deleted file mode 100644 index a949b7d..0000000 --- a/Sound/Music/Wanderer.mp3.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -uid="uid://cunvnj1r47u1y" -path="res://.godot/imported/Wanderer.mp3-b942f1347fe8fbd5f59e85b2df0901f7.mp3str" - -[deps] - -source_file="res://Sound/Music/Wanderer.mp3" -dest_files=["res://.godot/imported/Wanderer.mp3-b942f1347fe8fbd5f59e85b2df0901f7.mp3str"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/Sound/Music/Wanderer.ogg b/Sound/Music/Wanderer.ogg new file mode 100644 index 0000000..97eea27 Binary files /dev/null and b/Sound/Music/Wanderer.ogg differ diff --git a/Sound/Music/Wanderer.ogg.import b/Sound/Music/Wanderer.ogg.import new file mode 100644 index 0000000..70c69f4 --- /dev/null +++ b/Sound/Music/Wanderer.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://cqarbn5br0mtg" +path="res://.godot/imported/Wanderer.ogg-2e3b5f804bd34651cecfd35c3a9d0d72.oggvorbisstr" + +[deps] + +source_file="res://Sound/Music/Wanderer.ogg" +dest_files=["res://.godot/imported/Wanderer.ogg-2e3b5f804bd34651cecfd35c3a9d0d72.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Sound/Music/fight-for-your-rights-13529.mp3 b/Sound/Music/fight-for-your-rights-13529.mp3 new file mode 100644 index 0000000..1f1c291 Binary files /dev/null and b/Sound/Music/fight-for-your-rights-13529.mp3 differ diff --git a/Sound/Music/fight-for-your-rights-13529.mp3.import b/Sound/Music/fight-for-your-rights-13529.mp3.import new file mode 100644 index 0000000..5f9d56f --- /dev/null +++ b/Sound/Music/fight-for-your-rights-13529.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://tulfp2cuvaiv" +path="res://.godot/imported/fight-for-your-rights-13529.mp3-822163be845b7d3bff58974705cb0798.mp3str" + +[deps] + +source_file="res://Sound/Music/fight-for-your-rights-13529.mp3" +dest_files=["res://.godot/imported/fight-for-your-rights-13529.mp3-822163be845b7d3bff58974705cb0798.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Sound/Music/pirate-tavern-full-version-167990.mp3 b/Sound/Music/pirate-tavern-full-version-167990.mp3 new file mode 100644 index 0000000..0f7aee1 Binary files /dev/null and b/Sound/Music/pirate-tavern-full-version-167990.mp3 differ diff --git a/Sound/Music/pirate-tavern-full-version-167990.mp3.import b/Sound/Music/pirate-tavern-full-version-167990.mp3.import new file mode 100644 index 0000000..5a3c220 --- /dev/null +++ b/Sound/Music/pirate-tavern-full-version-167990.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cjqn3r6xxbl6y" +path="res://.godot/imported/pirate-tavern-full-version-167990.mp3-0c958991f36ff60c560db89305eb1986.mp3str" + +[deps] + +source_file="res://Sound/Music/pirate-tavern-full-version-167990.mp3" +dest_files=["res://.godot/imported/pirate-tavern-full-version-167990.mp3-0c958991f36ff60c560db89305eb1986.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 0000000..a2274a1 --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,15 @@ +[gd_resource type="AudioBusLayout" format=3 uid="uid://dta3o0wsxws2s"] + +[resource] +bus/1/name = &"Music" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = -3.32444 +bus/1/send = &"Master" +bus/2/name = &"Effects" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master"