diff --git a/objects/entities/brick_player.tscn b/objects/entities/brick_player.tscn index 93c5a23..4c4b893 100644 --- a/objects/entities/brick_player.tscn +++ b/objects/entities/brick_player.tscn @@ -4,12 +4,8 @@ [ext_resource type="Resource" uid="uid://vgutbpovj8hc" path="res://resources/movement_presets/platform_movement.tres" id="2_7til7"] [ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="2_lgb3u"] [ext_resource type="Texture2D" uid="uid://jl1gwqchhpdc" path="res://sprites/left_eye.png" id="3_2srrh"] -[ext_resource type="Script" uid="uid://bf4yclropol43" path="res://scripts/components/Movement/GroundMovementAbility.cs" id="4_7til7"] [ext_resource type="Texture2D" uid="uid://iiawtnwmeny3" path="res://sprites/right_eye.png" id="4_ccn81"] [ext_resource type="Texture2D" uid="uid://0l454rfplmqg" path="res://sprites/MrBrick_base-sheet.png" id="5_yysbb"] -[ext_resource type="Script" uid="uid://chgw53qwt7rt8" path="res://scripts/components/Movement/GravityAbility.cs" id="6_xuhvf"] -[ext_resource type="Script" uid="uid://ccksp2e76s7sr" path="res://scripts/components/Movement/VariableJumpAbility.cs" id="7_bl1gx"] -[ext_resource type="Script" uid="uid://ck6kmnbwhsttt" path="res://scripts/components/Movement/OneWayPlatformAbility.cs" id="7_uno3u"] [ext_resource type="Texture2D" uid="uid://dhkwyv6ayb5qb" path="res://sprites/flying_ship.png" id="8_6lsog"] [ext_resource type="Script" uid="uid://dy78ak8eykw6e" path="res://scripts/components/FlipComponent.cs" id="9_yysbb"] [ext_resource type="Script" uid="uid://mnjg3p0aw1ow" path="res://scripts/components/CanPickUpComponent.cs" id="10_yysbb"] @@ -69,7 +65,7 @@ point_count = 2 [sub_resource type="CurveTexture" id="CurveTexture_xoue7"] curve = SubResource("Curve_82d6e") -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_e5pae"] +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_oxudy"] resource_local_to_scene = true lifetime_randomness = 1.0 particle_flag_disable_z = true @@ -96,25 +92,6 @@ metadata/_custom_type_script = "uid://csel4s0e4g5uf" [node name="Movements" type="Node" parent="." unique_id=1545001] -[node name="GroundMovementAbility" type="Node" parent="Movements" unique_id=1025594633] -script = ExtResource("4_7til7") -MaxSpeed = 376.0 -Friction = 2500.0 -metadata/_custom_type_script = "uid://bf4yclropol43" - -[node name="GravityAbility" type="Node" parent="Movements" unique_id=1144662059] -script = ExtResource("6_xuhvf") -metadata/_custom_type_script = "uid://chgw53qwt7rt8" - -[node name="VariableJumpAbility" type="Node" parent="Movements" unique_id=632375899] -script = ExtResource("7_bl1gx") -JumpCutMultiplier = 0.507 -metadata/_custom_type_script = "uid://ccksp2e76s7sr" - -[node name="OneWayPlatformAbility" type="Node" parent="Movements" unique_id=800681205] -script = ExtResource("7_uno3u") -metadata/_custom_type_script = "uid://ck6kmnbwhsttt" - [node name="Graphics" type="Node2D" parent="." unique_id=271317654] [node name="Root" type="Node2D" parent="Graphics" unique_id=2012260442] @@ -247,7 +224,7 @@ offset_right = 23.0 offset_bottom = -20.0 [node name="HitParticles" parent="." unique_id=1322585720 instance=ExtResource("28_jh5m0")] -process_material = SubResource("ParticleProcessMaterial_e5pae") +process_material = SubResource("ParticleProcessMaterial_oxudy") [node name="ShipShooter" type="Node" parent="." unique_id=1147013800 node_paths=PackedStringArray("BulletSpawn", "ShootSfx")] script = ExtResource("30_usc1p") diff --git a/objects/entities/jump_pad.tscn b/objects/entities/jump_pad.tscn index a346395..41c1d6d 100644 --- a/objects/entities/jump_pad.tscn +++ b/objects/entities/jump_pad.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://cm3rixnnev1pg"] +[gd_scene format=3 uid="uid://cm3rixnnev1pg"] [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_ctugi"] [ext_resource type="Script" uid="uid://bgbnof7aeydmq" path="res://scripts/components/JumpPadComponent.cs" id="2_huktk"] @@ -6,23 +6,23 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_ci3ij"] size = Vector2(16, 6) -[node name="Jump pad" type="Area2D"] +[node name="Jump pad" type="Area2D" unique_id=986549607] collision_layer = 0 collision_mask = 4 -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1755302504] position = Vector2(0, 5) shape = SubResource("RectangleShape2D_ci3ij") -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1150967280] texture = ExtResource("1_ctugi") hframes = 12 vframes = 12 frame = 120 -[node name="JumpPadComponent" type="Node" parent="." node_paths=PackedStringArray("Area", "Sprite")] +[node name="JumpPadComponent" type="Node" parent="." unique_id=1295810804 node_paths=PackedStringArray("Area", "Sprite")] script = ExtResource("2_huktk") -JumpForce = 1110.0 +JumpForce = 1210.0 Area = NodePath("..") Sprite = NodePath("../Sprite2D") StartAnimationIndex = 120 diff --git a/objects/movement_abilities/variable_jump_ability.tscn b/objects/movement_abilities/variable_jump_ability.tscn index a4555ba..e6e3a19 100644 --- a/objects/movement_abilities/variable_jump_ability.tscn +++ b/objects/movement_abilities/variable_jump_ability.tscn @@ -4,6 +4,6 @@ [node name="VariableJumpAbility" type="Node" unique_id=735694377] script = ExtResource("1_y30i5") -JumpHeight = 120.0 +JumpHeight = 112.0 JumpCutMultiplier = 0.507 metadata/_custom_type_script = "uid://ccksp2e76s7sr" diff --git a/objects/ui/pause_menu.tscn b/objects/ui/pause_menu.tscn index be67a51..385cc3a 100644 --- a/objects/ui/pause_menu.tscn +++ b/objects/ui/pause_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://i6mnjbjcoqe5"] +[gd_scene format=3 uid="uid://i6mnjbjcoqe5"] [ext_resource type="Script" uid="uid://cakgxndurgfa3" path="res://scripts/UI/PauseMenu.cs" id="1_h4pd5"] [ext_resource type="PackedScene" uid="uid://cl00e2ocomk3m" path="res://scenes/main_menu.tscn" id="2_h4pd5"] @@ -6,7 +6,7 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_g4ivv"] bg_color = Color(0, 0, 0, 1) -[node name="Pause menu" type="Control" node_paths=PackedStringArray("PauseMenuControl", "ResumeButton", "MainMenuButton", "QuitButton", "SettingsButton")] +[node name="Pause menu" type="Control" unique_id=923659871 node_paths=PackedStringArray("PauseMenuControl", "ResumeButton", "MainMenuButton", "QuitButton", "SettingsButton")] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -23,7 +23,7 @@ QuitButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Quit game Bu SettingsButton = NodePath("PanelContainer/MarginContainer/VBoxContainer/Settings Button") MainMenuScene = ExtResource("2_h4pd5") -[node name="PanelContainer" type="PanelContainer" parent="."] +[node name="PanelContainer" type="PanelContainer" parent="." unique_id=1782689001] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -32,46 +32,52 @@ grow_horizontal = 2 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_g4ivv") -[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer" unique_id=824088919] layout_mode = 2 theme_override_constants/margin_left = 8 theme_override_constants/margin_top = 8 theme_override_constants/margin_right = 8 theme_override_constants/margin_bottom = 8 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer" unique_id=1826945529] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 -[node name="Pause" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Pause" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=1706564131] layout_mode = 2 text = "PAUSE" horizontal_alignment = 1 vertical_alignment = 1 uppercase = true -[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Spacer" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=868621584] custom_minimum_size = Vector2(0, 32) layout_mode = 2 size_flags_vertical = 3 -[node name="Resume Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Resume Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=826636099] layout_mode = 2 +focus_next = NodePath("../Settings Button") text = "RESUME_BUTTON" flat = true -[node name="Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Settings Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=334350065] layout_mode = 2 +focus_next = NodePath("../Exit to menu Button") +focus_previous = NodePath("../Resume Button") text = "SETTINGS_BUTTON" flat = true -[node name="Exit to menu Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Exit to menu Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=683937353] layout_mode = 2 +focus_next = NodePath("../Quit game Button") +focus_previous = NodePath("../Settings Button") text = "EXIT_TO_MENU_BUTTON" flat = true -[node name="Quit game Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Quit game Button" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer" unique_id=2008979602] layout_mode = 2 +focus_previous = NodePath("../Exit to menu Button") text = "QUIT_BUTTON" flat = true diff --git a/scenes/level_village_1.tscn b/scenes/level_village_1.tscn index 13d1194..7244988 100644 --- a/scenes/level_village_1.tscn +++ b/scenes/level_village_1.tscn @@ -67,7 +67,7 @@ transition = 3 [node name="Brick Player" parent="." unique_id=1617406140 instance=ExtResource("1_dnj2y")] z_index = 10 -[node name="HitParticles" parent="Brick Player" index="23"] +[node name="HitParticles" parent="Brick Player" index="23" unique_id=1322585720] process_material = SubResource("ParticleProcessMaterial_84xgs") [node name="WorldEnvironment" parent="." unique_id=1232714328 instance=ExtResource("2_1vw1j")] diff --git a/scripts/UI/SettingsMenu.cs b/scripts/UI/SettingsMenu.cs index 601f224..9f906b2 100644 --- a/scripts/UI/SettingsMenu.cs +++ b/scripts/UI/SettingsMenu.cs @@ -19,10 +19,10 @@ public partial class SettingsMenu : Control public override void _Ready() { - InputSettingsButton.FocusMode = Control.FocusModeEnum.All; - AudioSettingsButton.FocusMode = Control.FocusModeEnum.All; - DisplaySettingsButton.FocusMode = Control.FocusModeEnum.All; - GameplaySettingsButton.FocusMode = Control.FocusModeEnum.All; + InputSettingsButton.FocusMode = FocusModeEnum.All; + AudioSettingsButton.FocusMode = FocusModeEnum.All; + DisplaySettingsButton.FocusMode = FocusModeEnum.All; + GameplaySettingsButton.FocusMode = FocusModeEnum.All; InputSettingsButton.Pressed += OnInputSettingsPressed; AudioSettingsButton.Pressed += OnAudioSettingsPressed;