yuki/smashball
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move hit timer to player

Browse source
This commit is contained in:
yuki 2025-11-14 22:30:17 -03:00
parent 43500b3ca5
commit 4b21537f52
5 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scenes/hit/hit.gd
View file

@ -1,11 +0,0 @@
extends Area2D
@onready var timer: Timer = $Timer
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
timer.connect("timeout", _despawn)
func _despawn() -> void:
queue_free()

1
scenes/hit/hit.gd.uid
View file

@ -1 +0,0 @@
uid://c0m6xhbtgbgtu

9
scenes/hit/hit.tscn
View file

@ -1,6 +1,5 @@
[gd_scene load_steps=4 format=3 uid="uid://px67runjx6ex"] [gd_scene load_steps=3 format=3 uid="uid://px67runjx6ex"]
[ext_resource type="Script" uid="uid://c0m6xhbtgbgtu" path="res://scenes/hit/hit.gd" id="1_fxeki"]
[ext_resource type="Texture2D" uid="uid://c6a62gvw7218s" path="res://scenes/hit/hit.png" id="1_wjo4f"] [ext_resource type="Texture2D" uid="uid://c6a62gvw7218s" path="res://scenes/hit/hit.png" id="1_wjo4f"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_fxeki"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_fxeki"]
@ -10,7 +9,6 @@ height = 18.0
[node name="Hit" type="Area2D" groups=["hit"]] [node name="Hit" type="Area2D" groups=["hit"]]
collision_layer = 64 collision_layer = 64
collision_mask = 0 collision_mask = 0
script = ExtResource("1_fxeki")
[node name="Sprite2D" type="Sprite2D" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2(7, -4) position = Vector2(7, -4)
@ -21,8 +19,3 @@ position = Vector2(5, -1)
rotation = 1.5707964 rotation = 1.5707964
shape = SubResource("CapsuleShape2D_fxeki") shape = SubResource("CapsuleShape2D_fxeki")
debug_color = Color(0.6205005, 0.42311785, 0.8432588, 0.41960785) debug_color = Color(0.6205005, 0.42311785, 0.8432588, 0.41960785)
[node name="Timer" type="Timer" parent="."]
wait_time = 0.5
one_shot = true
autostart = true

1
scenes/player/player.gd
View file

@ -7,6 +7,7 @@ const DEADZONE: float = 0.1
@onready var sprite: AnimatedSprite2D = $AnimatedSprite2D @onready var sprite: AnimatedSprite2D = $AnimatedSprite2D
@onready var state_machine: StateMachine = $StateMachine @onready var state_machine: StateMachine = $StateMachine
@onready var hit_timer: Timer = $HitTimer
var anim_dir: String var anim_dir: String
var def_dir: String var def_dir: String

8
scenes/player/player.tscn
View file

@ -4,8 +4,8 @@
[ext_resource type="Texture2D" uid="uid://b8ptokcqwpdud" path="res://scenes/player/saffron.png" id="2_3li8b"] [ext_resource type="Texture2D" uid="uid://b8ptokcqwpdud" path="res://scenes/player/saffron.png" id="2_3li8b"]
[ext_resource type="Script" uid="uid://dqjaxgmyxq3rx" path="res://scenes/classes/state_machine.gd" id="3_lvxji"] [ext_resource type="Script" uid="uid://dqjaxgmyxq3rx" path="res://scenes/classes/state_machine.gd" id="3_lvxji"]
[ext_resource type="Script" uid="uid://delyni51vg6us" path="res://scenes/player/states/idle.gd" id="4_75vfm"] [ext_resource type="Script" uid="uid://delyni51vg6us" path="res://scenes/player/states/idle.gd" id="4_75vfm"]
[ext_resource type="Script" uid="uid://b2sr7p80gdjii" path="res://scenes/classes/player_state.gd" id="4_p47bc"]
[ext_resource type="Script" uid="uid://dxfs1b8fuk7kv" path="res://scenes/player/states/running.gd" id="5_75vfm"] [ext_resource type="Script" uid="uid://dxfs1b8fuk7kv" path="res://scenes/player/states/running.gd" id="5_75vfm"]
[ext_resource type="Script" uid="uid://n7v8leojhykt" path="res://scenes/player/states/hitting.gd" id="6_75vfm"]
[sub_resource type="AtlasTexture" id="AtlasTexture_g2els"] [sub_resource type="AtlasTexture" id="AtlasTexture_g2els"]
atlas = ExtResource("2_3li8b") atlas = ExtResource("2_3li8b")
@ -160,5 +160,9 @@ script = ExtResource("5_75vfm")
metadata/_custom_type_script = "uid://b2sr7p80gdjii" metadata/_custom_type_script = "uid://b2sr7p80gdjii"
[node name="Hitting" type="Node" parent="StateMachine"] [node name="Hitting" type="Node" parent="StateMachine"]
script = ExtResource("4_p47bc") script = ExtResource("6_75vfm")
metadata/_custom_type_script = "uid://b2sr7p80gdjii" metadata/_custom_type_script = "uid://b2sr7p80gdjii"
[node name="HitTimer" type="Timer" parent="."]
wait_time = 0.5
one_shot = true