Hitboxes/Hurtboxes update
This commit is contained in:
@ -22,7 +22,7 @@ onready var animationState = animationTree.get("parameters/playback")
|
||||
func _ready():
|
||||
animationTree.active = true
|
||||
|
||||
func _physics_process(delta):
|
||||
func _process(delta):
|
||||
match state:
|
||||
MOVE:
|
||||
move_state(delta)
|
||||
|
@ -1,7 +1,8 @@
|
||||
[gd_scene load_steps=40 format=2]
|
||||
[gd_scene load_steps=42 format=2]
|
||||
|
||||
[ext_resource path="res://Player/Player.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Player/Player.png" type="Texture" id=2]
|
||||
[ext_resource path="res://Overlap/Hitbox.tscn" type="PackedScene" id=3]
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=1]
|
||||
radius = 4.0
|
||||
@ -36,6 +37,30 @@ tracks/1/keys = {
|
||||
"method": "attack_aninimation_finished"
|
||||
} ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("HitboxPivot:rotation_degrees")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ 90.0 ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("HitboxPivot/SwordHitbox/CollisionShape2D:disabled")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0.1, 0.4 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=28]
|
||||
resource_name = "AttackLeft"
|
||||
@ -66,6 +91,30 @@ tracks/1/keys = {
|
||||
"method": "attack_aninimation_finished"
|
||||
} ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("HitboxPivot:rotation_degrees")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ 180.0 ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("HitboxPivot/SwordHitbox/CollisionShape2D:disabled")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0.1, 0.4 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=29]
|
||||
resource_name = "AttackRight"
|
||||
@ -77,7 +126,7 @@ tracks/0/loop_wrap = true
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/keys = {
|
||||
"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ),
|
||||
"times": PoolRealArray( 0, 0.100979, 0.2, 0.3 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ 24, 25, 26, 27 ]
|
||||
@ -96,6 +145,30 @@ tracks/1/keys = {
|
||||
"method": "attack_aninimation_finished"
|
||||
} ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("HitboxPivot:rotation_degrees")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ 0.0 ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("HitboxPivot/SwordHitbox/CollisionShape2D:disabled")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0.1, 0.4 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=30]
|
||||
resource_name = "AttackUp"
|
||||
@ -126,6 +199,30 @@ tracks/1/keys = {
|
||||
"method": "attack_aninimation_finished"
|
||||
} ]
|
||||
}
|
||||
tracks/2/type = "value"
|
||||
tracks/2/path = NodePath("HitboxPivot:rotation_degrees")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ 270.0 ]
|
||||
}
|
||||
tracks/3/type = "value"
|
||||
tracks/3/path = NodePath("HitboxPivot/SwordHitbox/CollisionShape2D:disabled")
|
||||
tracks/3/interp = 1
|
||||
tracks/3/loop_wrap = true
|
||||
tracks/3/imported = false
|
||||
tracks/3/enabled = true
|
||||
tracks/3/keys = {
|
||||
"times": PoolRealArray( 0.106438, 0.4 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ false, true ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=9]
|
||||
resource_name = "IdleDown"
|
||||
@ -209,6 +306,18 @@ tracks/0/keys = {
|
||||
"update": 0,
|
||||
"values": [ 0 ]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/path = NodePath("HitboxPivot/SwordHitbox/CollisionShape2D:disabled")
|
||||
tracks/1/interp = 1
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/imported = false
|
||||
tracks/1/enabled = true
|
||||
tracks/1/keys = {
|
||||
"times": PoolRealArray( 0 ),
|
||||
"transitions": PoolRealArray( 1 ),
|
||||
"update": 0,
|
||||
"values": [ true ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=6]
|
||||
resource_name = "RunDown"
|
||||
@ -377,7 +486,11 @@ start_node = "Idle"
|
||||
|
||||
[sub_resource type="AnimationNodeStateMachinePlayback" id=19]
|
||||
|
||||
[sub_resource type="CapsuleShape2D" id=40]
|
||||
height = 12.0
|
||||
|
||||
[node name="Player" type="KinematicBody2D"]
|
||||
collision_layer = 2
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
@ -411,3 +524,20 @@ parameters/playback = SubResource( 19 )
|
||||
parameters/Attack/blend_position = Vector2( 0, 0 )
|
||||
parameters/Idle/blend_position = Vector2( 0, 0 )
|
||||
parameters/Run/blend_position = Vector2( 0, 0 )
|
||||
|
||||
[node name="HitboxPivot" type="Position2D" parent="."]
|
||||
position = Vector2( 0, -4 )
|
||||
rotation = 4.71239
|
||||
__meta__ = {
|
||||
"_gizmo_extents_": 8.0
|
||||
}
|
||||
|
||||
[node name="SwordHitbox" parent="HitboxPivot" instance=ExtResource( 3 )]
|
||||
position = Vector2( 15, 0 )
|
||||
collision_mask = 8
|
||||
|
||||
[node name="CollisionShape2D" parent="HitboxPivot/SwordHitbox" index="0"]
|
||||
shape = SubResource( 40 )
|
||||
disabled = true
|
||||
|
||||
[editable path="HitboxPivot/SwordHitbox"]
|
||||
|
Reference in New Issue
Block a user