Some bugfixes

This commit is contained in:
2026-07-05 00:48:05 +03:00
parent 14868e5b51
commit 7a31327940
6 changed files with 36 additions and 39 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ extends ColorRect
const DAMAGE_VALUE = 50.0 const DAMAGE_VALUE = 50.0
const COLLISION_OFFSET = Vector2(8, 8) const COLLISION_OFFSET = Vector2(16, 16)
var _player : Player var _player : Player
+12 -13
View File
@@ -8,10 +8,6 @@
[ext_resource type="PackedScene" uid="uid://bboaskqiwnbsb" path="res://game/entities/player/states/jump_state.tscn" id="6_v0nmi"] [ext_resource type="PackedScene" uid="uid://bboaskqiwnbsb" path="res://game/entities/player/states/jump_state.tscn" id="6_v0nmi"]
[ext_resource type="PackedScene" uid="uid://ba5sknbijujl2" path="res://game/entities/player/states/wall_state.tscn" id="7_dhej3"] [ext_resource type="PackedScene" uid="uid://ba5sknbijujl2" path="res://game/entities/player/states/wall_state.tscn" id="7_dhej3"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_bhunq"]
radius = 4.5
height = 28.0
[sub_resource type="AtlasTexture" id="AtlasTexture_cjfdk"] [sub_resource type="AtlasTexture" id="AtlasTexture_cjfdk"]
atlas = ExtResource("2_cjfdk") atlas = ExtResource("2_cjfdk")
region = Rect2(0, 32, 32, 32) region = Rect2(0, 32, 32, 32)
@@ -524,8 +520,11 @@ animations = [{
"speed": 20.0 "speed": 20.0
}] }]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_bhunq"]
radius = 2.5
height = 24.0
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_riqys"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_riqys"]
radius = 8.0
height = 24.0 height = 24.0
[sub_resource type="Gradient" id="Gradient_qr0ht"] [sub_resource type="Gradient" id="Gradient_qr0ht"]
@@ -549,13 +548,9 @@ color_ramp = SubResource("GradientTexture1D_riqys")
collision_layer = 2 collision_layer = 2
script = ExtResource("1_1a4jd") script = ExtResource("1_1a4jd")
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=379935685]
position = Vector2(0.5, 2)
shape = SubResource("CapsuleShape2D_bhunq")
[node name="PlayerSprite" type="AnimatedSprite2D" parent="." unique_id=2025942250] [node name="PlayerSprite" type="AnimatedSprite2D" parent="." unique_id=2025942250]
sprite_frames = SubResource("SpriteFrames_bhunq") sprite_frames = SubResource("SpriteFrames_bhunq")
animation = &"run_right" animation = &"idle"
[node name="BladeSprite" type="AnimatedSprite2D" parent="." unique_id=1561250707] [node name="BladeSprite" type="AnimatedSprite2D" parent="." unique_id=1561250707]
position = Vector2(0, 8) position = Vector2(0, 8)
@@ -576,8 +571,12 @@ animation = &"attack"
frame = 5 frame = 5
frame_progress = 1.0 frame_progress = 1.0
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=379935685]
position = Vector2(0.5, 4)
shape = SubResource("CapsuleShape2D_bhunq")
[node name="LeftAttackArea" type="Area2D" parent="." unique_id=829956444] [node name="LeftAttackArea" type="Area2D" parent="." unique_id=829956444]
position = Vector2(-20, 0) position = Vector2(-18, 0)
collision_layer = 16 collision_layer = 16
collision_mask = 8 collision_mask = 8
monitoring = false monitoring = false
@@ -586,7 +585,7 @@ monitoring = false
shape = SubResource("CapsuleShape2D_riqys") shape = SubResource("CapsuleShape2D_riqys")
[node name="RightAttackArea" type="Area2D" parent="." unique_id=1656556085] [node name="RightAttackArea" type="Area2D" parent="." unique_id=1656556085]
position = Vector2(20, 0) position = Vector2(19, 0)
collision_layer = 16 collision_layer = 16
collision_mask = 8 collision_mask = 8
monitoring = false monitoring = false
@@ -680,7 +679,7 @@ wait_time = 0.5
[node name="AttackCooldownTimer" type="Timer" parent="." unique_id=1208896947] [node name="AttackCooldownTimer" type="Timer" parent="." unique_id=1208896947]
process_callback = 0 process_callback = 0
wait_time = 0.5 wait_time = 0.4
one_shot = true one_shot = true
[node name="WallLeftParticles" type="GPUParticles2D" parent="." unique_id=2009522894] [node name="WallLeftParticles" type="GPUParticles2D" parent="." unique_id=2009522894]
+10 -18
View File
@@ -20,23 +20,19 @@ tile_map_data = PackedByteArray("AAAJAPn/AQABAAsAAAAKAPn/AQADABIAAAAKAPr/AQACABE
position = Vector2(7054, -79) position = Vector2(7054, -79)
[node name="Jump1" type="Node2D" parent="Guidances" parent_id_path=PackedInt32Array(1356136322) index="1" unique_id=140077451] [node name="Jump1" type="Node2D" parent="Guidances" parent_id_path=PackedInt32Array(1356136322) index="1" unique_id=140077451]
position = Vector2(2578, -444) position = Vector2(2567, -484)
[node name="Keyboard" parent="Guidances/Jump1" index="0" unique_id=1389188230 instance=ExtResource("2_2vfi4")] [node name="Keyboard" parent="Guidances/Jump1" index="0" unique_id=1389188230 instance=ExtResource("2_2vfi4")]
custom_size = Vector2(98, 194) custom_size = Vector2(98, 130)
size = 2 size = 2
text = "I text = "D
D
+ +
SPACE" SPACE"
[node name="Gamepad" parent="Guidances/Jump1" index="1" unique_id=1731715060 instance=ExtResource("2_2vfi4")] [node name="Gamepad" parent="Guidances/Jump1" index="1" unique_id=1731715060 instance=ExtResource("2_2vfi4")]
custom_size = Vector2(98, 194) custom_size = Vector2(98, 130)
size = 2 size = 2
text = "I text = "LS >
LS >
+ +
A" A"
@@ -45,23 +41,19 @@ keyboard_guidance = NodePath("../Keyboard")
gamepad_guidance = NodePath("../Gamepad") gamepad_guidance = NodePath("../Gamepad")
[node name="Jump2" type="Node2D" parent="Guidances" parent_id_path=PackedInt32Array(1356136322) index="2" unique_id=1019127324] [node name="Jump2" type="Node2D" parent="Guidances" parent_id_path=PackedInt32Array(1356136322) index="2" unique_id=1019127324]
position = Vector2(2337, -558) position = Vector2(2338, -526)
[node name="Keyboard" parent="Guidances/Jump2" index="0" unique_id=805769241 instance=ExtResource("2_2vfi4")] [node name="Keyboard" parent="Guidances/Jump2" index="0" unique_id=805769241 instance=ExtResource("2_2vfi4")]
custom_size = Vector2(98, 194) custom_size = Vector2(98, 130)
size = 2 size = 2
text = "II text = "A
A
+ +
SPACE" SPACE"
[node name="Gamepad" parent="Guidances/Jump2" index="1" unique_id=244809676 instance=ExtResource("2_2vfi4")] [node name="Gamepad" parent="Guidances/Jump2" index="1" unique_id=244809676 instance=ExtResource("2_2vfi4")]
custom_size = Vector2(98, 194) custom_size = Vector2(98, 130)
size = 2 size = 2
text = "II text = "< LS
< LS
+ +
A" A"
+2 -2
View File
@@ -4,7 +4,7 @@
[ext_resource type="PackedScene" uid="uid://dlntrn4m04pxn" path="res://game/entities/guidance/level_end_guidance.tscn" id="2_1t02d"] [ext_resource type="PackedScene" uid="uid://dlntrn4m04pxn" path="res://game/entities/guidance/level_end_guidance.tscn" id="2_1t02d"]
[ext_resource type="PackedScene" uid="uid://dxqq07mde0b4a" path="res://game/entities/danger/danger.tscn" id="2_2w2dg"] [ext_resource type="PackedScene" uid="uid://dxqq07mde0b4a" path="res://game/entities/danger/danger.tscn" id="2_2w2dg"]
[sub_resource type="ViewportTexture" id="ViewportTexture_2w2dg"] [sub_resource type="ViewportTexture" id="ViewportTexture_1t02d"]
viewport_path = NodePath("CanvasLayer/CodeViewport") viewport_path = NodePath("CanvasLayer/CodeViewport")
[node name="Level7" unique_id=1001045799 instance=ExtResource("1_bhhdo")] [node name="Level7" unique_id=1001045799 instance=ExtResource("1_bhhdo")]
@@ -72,7 +72,7 @@ tile_map_data = PackedByteArray("AAD///P/AQAAAA4AAAANAPP/AQABAA4AAAATAAAAAQAAAA0
position = Vector2(4762, 82) position = Vector2(4762, 82)
[node name="CodeSprite" parent="CanvasLayer" parent_id_path=PackedInt32Array(1125559156) index="1" unique_id=1152584149] [node name="CodeSprite" parent="CanvasLayer" parent_id_path=PackedInt32Array(1125559156) index="1" unique_id=1152584149]
texture = SubResource("ViewportTexture_2w2dg") texture = SubResource("ViewportTexture_1t02d")
[node name="LevelEnd" parent="." index="14" unique_id=1444951079] [node name="LevelEnd" parent="." index="14" unique_id=1444951079]
position = Vector2(5208, -608) position = Vector2(5208, -608)
+1 -1
View File
@@ -65,7 +65,7 @@ layout_mode = 2
size_flags_vertical = 1 size_flags_vertical = 1
theme_override_fonts/font = ExtResource("3_i4f54") theme_override_fonts/font = ExtResource("3_i4f54")
theme_override_font_sizes/font_size = 8 theme_override_font_sizes/font_size = 8
text = "v 1.0.0 text = "v 1.0.1
(c) Ruslan Ignatov 2026 (c) Ruslan Ignatov 2026
Powered by Godot Engine" Powered by Godot Engine"
horizontal_alignment = 2 horizontal_alignment = 2
+10 -4
View File
@@ -65,6 +65,8 @@ text = "FULLSCREEN"
[node name="WindowFactorLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1054219556] [node name="WindowFactorLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1054219556]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
text = "WINDOW FACTOR"
horizontal_alignment = 2
[node name="WindowFactorContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2006592987] [node name="WindowFactorContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2006592987]
unique_name_in_owner = true unique_name_in_owner = true
@@ -102,7 +104,8 @@ metadata/window_factor = 5
[node name="MasterLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1502062154] [node name="MasterLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1502062154]
layout_mode = 2 layout_mode = 2
text = "MASTER" text = "MASTER VOLUME"
horizontal_alignment = 2
[node name="MasterSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1600615574] [node name="MasterSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1600615574]
unique_name_in_owner = true unique_name_in_owner = true
@@ -116,7 +119,8 @@ ticks_position = 3
[node name="UILabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1039303416] [node name="UILabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=1039303416]
layout_mode = 2 layout_mode = 2
text = "UI" text = "UI VOLUME"
horizontal_alignment = 2
[node name="UISlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2094741924] [node name="UISlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2094741924]
unique_name_in_owner = true unique_name_in_owner = true
@@ -130,7 +134,8 @@ ticks_position = 3
[node name="SFXLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=122025284] [node name="SFXLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=122025284]
layout_mode = 2 layout_mode = 2
text = "SFX" text = "SFX VOLUME"
horizontal_alignment = 2
[node name="SFXSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=630139889] [node name="SFXSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=630139889]
unique_name_in_owner = true unique_name_in_owner = true
@@ -144,7 +149,8 @@ ticks_position = 3
[node name="MusicLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2133353313] [node name="MusicLabel" type="Label" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=2133353313]
layout_mode = 2 layout_mode = 2
text = "MUSIC" text = "MUSIC VOLUME"
horizontal_alignment = 2
[node name="MusicSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=537100873] [node name="MusicSlider" type="HSlider" parent="MarginContainer/VBoxContainer/GridContainer" unique_id=537100873]
unique_name_in_owner = true unique_name_in_owner = true