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

remove unnecessary generic hit class

Browse source
This commit is contained in:
yuki 2025-11-18 18:38:29 -03:00
parent 75b2edc212
commit c9f76af3f7
6 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
classes/hit/hit.gd
View file

@ -1,3 +0,0 @@
class_name Hit extends Area2D
@export var power_hit: bool = false

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

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

12
classes/hit/hit.tscn
View file

@ -1,12 +0,0 @@
[gd_scene load_steps=2 format=3 uid="uid://d04legmj3c42r"]
[ext_resource type="Script" uid="uid://b440ri3521uio" path="res://classes/hit/hit.gd" id="1_udkr8"]
[node name="Hit2D" type="Area2D" groups=["hit"]]
collision_layer = 64
collision_mask = 0
script = ExtResource("1_udkr8")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
rotation = 1.5707964
debug_color = Color(0.6205005, 0.42311785, 0.8432588, 0.41960785)

8
scenes/ball/ball.gd
View file

@ -43,16 +43,16 @@ func _decelerate_to_stop(duration: float = 0.3) -> void:
)
func _on_hit(hitbox: Hit) -> void:
func _on_hit(hitbox: Area2D) -> void:
print("area detected")
if not is_hit:
if hitbox.is_in_group("hit"):
assert(hitbox.power_hit != null, "hit doesnt have correct metadata, is it a hit?")
assert(hitbox.has_meta("power_hit"), "hit doesnt have correct metadata, is it a hit?")
print("ball not hit yet")
var player: Player = hitbox.get_parent()
var timer: Timer = player.hit_timer
var angle: float = (PI/2 if hitbox.power_hit else randf_range(3*PI/4, PI/4)) * (-1 if player.id == 1 else 1)
var speed: float = randf_range(350, 450) if hitbox.power_hit else 0.0 # o.o
var angle: float = (PI/2 if hitbox.get_meta("power_hit") else randf_range(3*PI/4, PI/4)) * (-1 if player.id == 1 else 1)
var speed: float = randf_range(350, 450) if hitbox.get_meta("power_hit") else 0.0 # o.o
launch(angle, speed)
print("ball hit")
if not timer.is_connected("timeout", _on_hit_end):

6
scenes/hit/power_hit.tscn
View file

@ -1,6 +1,5 @@
[gd_scene load_steps=4 format=3 uid="uid://d0c57c37o75b0"]
[gd_scene load_steps=3 format=3 uid="uid://d0c57c37o75b0"]
[ext_resource type="Script" uid="uid://b440ri3521uio" path="res://classes/hit/hit.gd" id="1_kwsj5"]
[ext_resource type="Texture2D" uid="uid://c6a62gvw7218s" path="res://scenes/hit/assets/hit.png" id="2_kwsj5"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_kwsj5"]
@ -10,9 +9,6 @@ height = 70.0
[node name="PowerHit2D" type="Area2D" groups=["hit"]]
collision_layer = 64
collision_mask = 0
script = ExtResource("1_kwsj5")
power_hit = true
metadata/_custom_type_script = "uid://b440ri3521uio"
metadata/power_hit = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

4
scenes/hit/small_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://b440ri3521uio" path="res://classes/hit/hit.gd" id="1_dk3vy"]
[ext_resource type="Texture2D" uid="uid://c6a62gvw7218s" path="res://scenes/hit/assets/hit.png" id="1_rmj1p"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_fxeki"]
@ -10,7 +9,6 @@ height = 34.0
[node name="SmallHit2D" type="Area2D" groups=["hit"]]
collision_layer = 64
collision_mask = 0
script = ExtResource("1_dk3vy")
metadata/_custom_type_script = "uid://b440ri3521uio"
metadata/power_hit = false