diff --git a/scenes/player.tscn b/scenes/player.tscn index e3fca4b..8ea4e88 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -7,9 +7,6 @@ [ext_resource type="Texture2D" uid="uid://cfb1vyk7t0pkn" path="res://assets/Swordsman_lvl1/Without_shadow/Swordsman_lvl1_Run_without_shadow.png" id="3_dqkch"] [ext_resource type="Texture2D" uid="uid://cw2gocls81uli" path="res://assets/Swordsman_lvl1/Without_shadow/Swordsman_lvl1_Walk_without_shadow.png" id="4_dqkch"] -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_u8vuu"] -radius = 7.0 - [sub_resource type="AtlasTexture" id="AtlasTexture_qsb7e"] atlas = ExtResource("2_tuyoq") region = Rect2(0, 0, 64, 64) @@ -775,6 +772,10 @@ animations = [{ "speed": 10.0 }] +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_u8vuu"] +radius = 7.0 +height = 14.0 + [sub_resource type="CircleShape2D" id="CircleShape2D_tuyoq"] radius = 30.0 @@ -783,14 +784,16 @@ collision_mask = 129 motion_mode = 1 script = ExtResource("1_3vyb7") -[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=896441301] -shape = SubResource("CapsuleShape2D_u8vuu") - [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1616479252] texture_filter = 1 +position = Vector2(0, -2) sprite_frames = SubResource("SpriteFrames_giy8y") animation = &"run_down" +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=896441301] +position = Vector2(0, 2) +shape = SubResource("CapsuleShape2D_u8vuu") + [node name="MeleeArea" type="Area2D" parent="." unique_id=24997730] [node name="CollisionShape2D" type="CollisionShape2D" parent="MeleeArea" unique_id=2002113716] diff --git a/scenes/witch.tscn b/scenes/witch.tscn index f9333ed..63fbba4 100644 --- a/scenes/witch.tscn +++ b/scenes/witch.tscn @@ -6,10 +6,6 @@ [ext_resource type="Texture2D" uid="uid://484stlylp2nk" path="res://assets/Cauldron's Brew/Equiptment.png" id="4_qrkn2"] [ext_resource type="Texture2D" uid="uid://c2sji04ufhh60" path="res://assets/Cauldron's Brew/Cauldron and Powder.png" id="5_vid1f"] -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_gyfn7"] -radius = 6.0 -height = 22.0 - [sub_resource type="AtlasTexture" id="AtlasTexture_b1vsk"] atlas = ExtResource("1_hgjeu") region = Rect2(0, 64, 24, 32) @@ -249,6 +245,10 @@ animations = [{ "speed": 5.0 }] +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_gyfn7"] +radius = 6.0 +height = 12.0 + [sub_resource type="AtlasTexture" id="AtlasTexture_f4ghg"] atlas = ExtResource("4_qrkn2") region = Rect2(96, 96, 96, 96) @@ -260,10 +260,6 @@ region = Rect2(480, 96, 96, 96) [node name="Witch" type="CharacterBody2D" unique_id=1188927311] script = ExtResource("1_b1vsk") -[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=774888103] -position = Vector2(0, 3) -shape = SubResource("CapsuleShape2D_gyfn7") - [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=698352033] texture_filter = 1 sprite_frames = SubResource("SpriteFrames_f4ghg") @@ -271,6 +267,10 @@ animation = &"south" autoplay = "south" frame_progress = 0.9113742 +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=774888103] +position = Vector2(0, 8) +shape = SubResource("CapsuleShape2D_gyfn7") + [node name="CauldronBar" type="HBoxContainer" parent="." unique_id=1541519739] modulate = Color(1, 1, 1, 0.8627451) anchors_preset = 5