diff --git a/assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg.import b/assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg.import index 7640c8e4..b73a6e4c 100644 --- a/assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg.import +++ b/assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://nrhxjdpuje3f" -path="res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.ctex" +path.s3tc="res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg" -dest_files=["res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.ctex"] +dest_files=["res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.s3tc.ctex", "res://.godot/imported/xbox_lt_outline.svg-7aebefa9684921bfb5211975ae57164f.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,7 +39,7 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg.import b/assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg.import index ccde5daa..b5da8dff 100644 --- a/assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg.import +++ b/assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://dyjvbsvbriii4" -path="res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.ctex" +path.s3tc="res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.s3tc.ctex" +path.etc2="res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg" -dest_files=["res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.ctex"] +dest_files=["res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.s3tc.ctex", "res://.godot/imported/xbox_rb_outline.svg-da022b434843043fffdf7deef5f634f4.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,7 +39,7 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 svg/scale=1.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/maps/levels/tuto_sword_parry.tscn b/maps/levels/tuto_sword_parry.tscn index d335e676..3b753cb9 100644 --- a/maps/levels/tuto_sword_parry.tscn +++ b/maps/levels/tuto_sword_parry.tscn @@ -8,6 +8,11 @@ [ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://scenes/components/movement/RMovement.cs" id="6_cgfmf"] [ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="7_hr4qv"] [ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="8_dkfm7"] +[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="9_ofbe2"] +[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="10_dkfm7"] +[ext_resource type="Texture2D" uid="uid://nrhxjdpuje3f" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg" id="11_nwk5u"] +[ext_resource type="Texture2D" uid="uid://cjh5cnvdbq5ku" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" id="12_xy0m1"] +[ext_resource type="Texture2D" uid="uid://dyjvbsvbriii4" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg" id="13_nwk5u"] [sub_resource type="Resource" id="Resource_nwk5u"] script = ExtResource("6_cgfmf") @@ -19,6 +24,34 @@ script = ExtResource("7_hr4qv") StartingHealth = 100.0 metadata/_custom_type_script = "uid://baiapod3csndf" +[sub_resource type="Resource" id="Resource_invhv"] +script = ExtResource("7_hr4qv") +StartingHealth = 1.0 +metadata/_custom_type_script = "uid://baiapod3csndf" + +[sub_resource type="Resource" id="Resource_cgfmf"] +script = ExtResource("9_ofbe2") +DamageType = 2 +metadata/_custom_type_script = "uid://jitubgv6judn" + +[sub_resource type="BoxShape3D" id="BoxShape3D_xy0m1"] +size = Vector3(3, 3.75, 3) + +[sub_resource type="BoxShape3D" id="BoxShape3D_05lnh"] +size = Vector3(9, 11, 19) + +[sub_resource type="BoxShape3D" id="BoxShape3D_t5o40"] +size = Vector3(9, 2.25, 5) + +[sub_resource type="BoxShape3D" id="BoxShape3D_dkfm7"] +size = Vector3(5, 2.25, 3.75) + +[sub_resource type="BoxShape3D" id="BoxShape3D_nwk5u"] +size = Vector3(5.5, 4.5, 2) + +[sub_resource type="BoxShape3D" id="BoxShape3D_prjj8"] +size = Vector3(5.25, 4.5, 3.5) + [node name="Main" unique_id=955321579 instance=ExtResource("1_8n6bu")] [node name="Player" parent="." index="6" unique_id=1309399929] @@ -26,6 +59,7 @@ transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0, 0) [node name="Playground" type="Node3D" parent="." index="7" unique_id=2099606598] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 57.5, 0, 0) +visible = false [node name="PlaytestArena" parent="Playground" index="0" unique_id=664535670 instance=ExtResource("2_wsc2c")] @@ -40,34 +74,31 @@ material = ExtResource("3_wsc2c") [node name="FixedDashthroughTarget" parent="Playground/Targets" index="0" unique_id=1291663508 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 17, 13.5, -9) -[node name="FixedDashthroughTarget11" parent="Playground/Targets" index="1" unique_id=2053952229 instance=ExtResource("4_invhv")] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -64.75, 20.5, -27.5) - -[node name="FixedDashthroughTarget8" parent="Playground/Targets" index="2" unique_id=475406577 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget8" parent="Playground/Targets" index="1" unique_id=475406577 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 17, 23, -34) -[node name="FixedDashthroughTarget9" parent="Playground/Targets" index="3" unique_id=168635463 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget9" parent="Playground/Targets" index="2" unique_id=168635463 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 35.5, 30.5, -42.5) -[node name="FixedDashthroughTarget10" parent="Playground/Targets" index="4" unique_id=119396227 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget10" parent="Playground/Targets" index="3" unique_id=119396227 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 26, 30.5, -42.5) -[node name="FixedDashthroughTarget7" parent="Playground/Targets" index="5" unique_id=282429016 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget7" parent="Playground/Targets" index="4" unique_id=282429016 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 10.5, 5.5, -9) -[node name="FixedDashthroughTarget6" parent="Playground/Targets" index="6" unique_id=437890277 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget6" parent="Playground/Targets" index="5" unique_id=437890277 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 8, 6, -30.5) -[node name="FixedDashthroughTarget4" parent="Playground/Targets" index="7" unique_id=1484691271 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget4" parent="Playground/Targets" index="6" unique_id=1484691271 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 30.5, 5, -33.5) -[node name="FixedDashthroughTarget5" parent="Playground/Targets" index="8" unique_id=434257222 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget5" parent="Playground/Targets" index="7" unique_id=434257222 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 26.5, 9.5, -44) -[node name="FixedDashthroughTarget2" parent="Playground/Targets" index="9" unique_id=272400108 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget2" parent="Playground/Targets" index="8" unique_id=272400108 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 27, 13.5, -9) -[node name="FixedDashthroughTarget3" parent="Playground/Targets" index="10" unique_id=1008201593 instance=ExtResource("4_invhv")] +[node name="FixedDashthroughTarget3" parent="Playground/Targets" index="9" unique_id=1008201593 instance=ExtResource("4_invhv")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 43, 6, -8.5) [node name="FlyingEnemies" type="Node3D" parent="Playground" index="2" unique_id=1518759273] @@ -289,7 +320,82 @@ use_collision = true collision_layer = 256 collision_mask = 65553 -[node name="DashWithMantle" type="CSGCombiner3D" parent="Tutorial" index="0" unique_id=128667834] +[node name="FixedDashthroughTarget11" parent="Tutorial" index="0" unique_id=2053952229 instance=ExtResource("4_invhv")] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -7.25, 20.5, -27.5) + +[node name="FixedDashthroughTarget13" parent="Tutorial" index="1" unique_id=1470128508 instance=ExtResource("4_invhv")] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 1.3647223, 23.75, -13.75) + +[node name="Enemy28" parent="Tutorial" index="2" unique_id=1765389924 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -5, 22, 16.5) +Target = NodePath("../../Player") +RHealth = SubResource("Resource_invhv") +RDamage = SubResource("Resource_cgfmf") +RMovement = SubResource("Resource_nwk5u") + +[node name="Triggers" type="Node3D" parent="Tutorial" index="3" unique_id=1531131828] + +[node name="TutoTrigger5" parent="Tutorial/Triggers" index="0" unique_id=840713937 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 23.25, -24.25) +first_input_texture = ExtResource("11_nwk5u") +second_input_texture = ExtResource("12_xy0m1") +tuto_text = "Dash through target" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger5" index="1" unique_id=1895232009] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 0.625, 1.75) +shape = SubResource("BoxShape3D_xy0m1") + +[node name="TutoTrigger" parent="Tutorial/Triggers" index="1" unique_id=1215265305 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0, -4.5) +first_input_texture = ExtResource("11_nwk5u") +second_input_texture = ExtResource("12_xy0m1") +tuto_text = "Aimed dash" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger" index="1" unique_id=1774867326] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, -3.75, -6.75) +shape = SubResource("BoxShape3D_05lnh") + +[node name="TutoTrigger2" parent="Tutorial/Triggers" index="2" unique_id=386301715 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.75, 0, -34.25) +first_input_texture = ExtResource("11_nwk5u") +complex_input_text = "blue target" +tuto_text = "mantle after dash" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger2" index="1" unique_id=525906537] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.625, 1.25) +shape = SubResource("BoxShape3D_t5o40") + +[node name="TutoTrigger3" parent="Tutorial/Triggers" index="3" unique_id=460767120 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.75, 7, -49) +first_input_texture = ExtResource("11_nwk5u") +complex_input_text = "in air" +tuto_text = "slows down time" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger3" index="1" unique_id=768845413] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.625, 0.875) +shape = SubResource("BoxShape3D_dkfm7") + +[node name="TutoTrigger4" parent="Tutorial/Triggers" index="4" unique_id=321542244 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.5, 17.75, -27.5) +first_input_texture = ExtResource("13_nwk5u") +complex_input_text = "at target" +tuto_text = "dash through" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger4" index="1" unique_id=1601250256] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.75, 0) +shape = SubResource("BoxShape3D_nwk5u") + +[node name="TutoTrigger6" parent="Tutorial/Triggers" index="5" unique_id=26112457 instance=ExtResource("10_dkfm7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.75, 22.75, 11.25) +first_input_texture = ExtResource("13_nwk5u") +complex_input_text = "at enemy" +tuto_text = "dash through" + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger6" index="1" unique_id=1214410006] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.625, 1.75, -0.75) +shape = SubResource("BoxShape3D_prjj8") + +[node name="DashWithMantle" type="CSGCombiner3D" parent="Tutorial" index="4" unique_id=128667834] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -36.5) [node name="CSGBox3D109" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="0" unique_id=531736596] @@ -334,133 +440,205 @@ use_collision = true size = Vector3(1, 1, 4.75) material = ExtResource("3_wsc2c") -[node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="7" unique_id=1446497915] +[node name="CSGBox3D134" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="7" unique_id=1136091363] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.5, 46.125) +use_collision = true +size = Vector3(5, 1, 4.75) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D135" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="8" unique_id=748140231] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 22.5, 46.125) +use_collision = true +size = Vector3(1, 1, 4.75) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D136" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="9" unique_id=436209430] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 22.5, 46.125) +use_collision = true +size = Vector3(1, 1, 4.75) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D137" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="10" unique_id=1930091014] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 22.5, 58) +use_collision = true +size = Vector3(1, 1, 11) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D138" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="11" unique_id=1299444131] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 22.5, 58) +use_collision = true +size = Vector3(1, 1, 11) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="12" unique_id=1446497915] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 17, 6.75) use_collision = true size = Vector3(1, 2, 6.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D127" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="8" unique_id=1731176595] +[node name="CSGBox3D127" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="13" unique_id=1731176595] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 17, 10.5) use_collision = true size = Vector3(4, 2, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="9" unique_id=1284139577] +[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="14" unique_id=1284139577] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.625, 10) use_collision = true size = Vector3(3, 2.25, 6) material = ExtResource("3_wsc2c") -[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="10" unique_id=1204742131] +[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="15" unique_id=1204742131] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 16.5, 4.75) use_collision = true size = Vector3(12, 1, 2.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="11" unique_id=1985192046] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.75, 6.5) +[node name="CSGBox3D139" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="16" unique_id=1561729125] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.5, 64.75) use_collision = true -size = Vector3(18, 9.5, 1) +size = Vector3(12, 1, 2.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D123" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="12" unique_id=696789507] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.875, 21.75, 10.5) +[node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="17" unique_id=1985192046] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 23.125, 6.5) use_collision = true -size = Vector3(6.25, 9.5, 1) +size = Vector3(18, 12.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D125" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="13" unique_id=1937274848] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 21.75, 7.5) +[node name="CSGBox3D130" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="18" unique_id=1502907002] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.25, 23.125, 44) use_collision = true -size = Vector3(7.25, 9.5, 1) +size = Vector3(7.5, 12.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D126" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="14" unique_id=1606556480] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 18.25, 9) +[node name="CSGBox3D131" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="19" unique_id=632272709] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.25, 23.125, 43) use_collision = true -size = Vector3(1, 2.5, 4) +size = Vector3(7.5, 12.25, 3) material = ExtResource("3_wsc2c") -[node name="CSGBox3D128" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="15" unique_id=1927103381] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 24, 9) +[node name="CSGBox3D140" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="20" unique_id=124463390] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 25.125, 66.5) use_collision = true -size = Vector3(7.25, 5, 2) +size = Vector3(12, 8.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D124" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="16" unique_id=1068505352] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5, 21.487345, 10.75) +[node name="CSGBox3D123" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="21" unique_id=696789507] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 23.125, 10.5) use_collision = true -size = Vector3(3, 1, 7.5) +size = Vector3(7.25, 12.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="17" unique_id=302433684] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.5, 21.75, 26.75) +[node name="CSGBox3D125" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="22" unique_id=1937274848] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 23.125, 7.5) use_collision = true -size = Vector3(1, 9.5, 33.5) +size = Vector3(7.25, 12.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="18" unique_id=1125662345] +[node name="CSGBox3D132" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="23" unique_id=249644458] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 29.625, 25.25) +use_collision = true +size = Vector3(18, 0.75, 38.5) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D126" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="24" unique_id=1606556480] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.125, 18.25, 9) +use_collision = true +size = Vector3(7.75, 2.5, 4) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D128" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="25" unique_id=1927103381] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 25.375, 9) +use_collision = true +size = Vector3(7.25, 7.75, 2) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D124" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="26" unique_id=1068505352] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5, 19.487345, 11.25) +use_collision = true +size = Vector3(3, 5, 8.5) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D129" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="27" unique_id=302301078] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.25, 19.487345, 38.625) +use_collision = true +size = Vector3(9.5, 5, 11.75) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D133" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="28" unique_id=672467040] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.487345, 58) +use_collision = true +size = Vector3(5, 1, 11) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="29" unique_id=302433684] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.875, 23.125, 26.25) +use_collision = true +size = Vector3(13.75, 12.25, 30.5) +material = ExtResource("3_wsc2c") + +[node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="30" unique_id=1125662345] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.5, 23.125, 25.25) use_collision = true size = Vector3(1, 12.25, 36.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D111" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="19" unique_id=923535141] +[node name="CSGBox3D111" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="31" unique_id=923535141] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -11.125, -3.75) use_collision = true size = Vector3(9, 4.25, 21.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial" index="1" unique_id=1217279859] +[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial" index="5" unique_id=1217279859] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -4.75, 0) use_collision = true size = Vector3(9, 8.5, 14) material = ExtResource("3_wsc2c") -[node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial" index="2" unique_id=720911926] +[node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial" index="6" unique_id=720911926] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 9.375, -11.75) use_collision = true size = Vector3(18, 15.25, 37.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial" index="3" unique_id=995233474] +[node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial" index="7" unique_id=995233474] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, -1, -26.5) use_collision = true size = Vector3(18, 1, 6) material = ExtResource("3_wsc2c") -[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial" index="4" unique_id=1412582714] +[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial" index="8" unique_id=1412582714] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.875, -3.75, -30) use_collision = true size = Vector3(11.75, 11, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial" index="5" unique_id=697302898] +[node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial" index="9" unique_id=697302898] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5, 0.125, -30) use_collision = true size = Vector3(3, 3.25, 1) material = ExtResource("3_wsc2c") -[node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial" index="6" unique_id=603171965] +[node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial" index="10" unique_id=603171965] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -6.25, -8) use_collision = true size = Vector3(9, 5.5, 2) material = ExtResource("3_wsc2c") -[node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial" index="7" unique_id=1950738925] +[node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial" index="11" unique_id=1950738925] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -7.75, -10) use_collision = true size = Vector3(9, 2.5, 2) material = ExtResource("3_wsc2c") -[node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial" index="8" unique_id=1024529143] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -21.75, -11.625) +[node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial" index="12" unique_id=1024529143] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -21.75, -11.75) use_collision = true -size = Vector3(9, 25.5, 37.75) +size = Vector3(9, 25.5, 37.5) material = ExtResource("3_wsc2c") -[node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial" index="9" unique_id=1261455320] +[node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial" index="13" unique_id=1261455320] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5, 16.5, -28.5) use_collision = true size = Vector3(3, 1, 4) diff --git a/scenes/player_controller/scripts/PlayerController.cs b/scenes/player_controller/scripts/PlayerController.cs index cc162300..e05ac15f 100644 --- a/scenes/player_controller/scripts/PlayerController.cs +++ b/scenes/player_controller/scripts/PlayerController.cs @@ -564,6 +564,7 @@ public partial class PlayerController : CharacterBody3D, _grounded.StateEntered += OnGrounded; _grounded.StatePhysicsProcessing += HandleGrounded; + _airborne.StateEntered += OnAirborne; _airborne.StatePhysicsProcessing += HandleAirborne; _onWall.StatePhysicsProcessing += HandleOnWall; @@ -854,6 +855,13 @@ public partial class PlayerController : CharacterBody3D, /////////////////////////// // Airborne management // /////////////////////////// + + public void OnAirborne() + { + if (_aiming.Active) + ReduceTimeScaleWhileAiming(); + } + public void HandleAirborne(float delta) { MoveInAir(delta, IsGroundLike());