Add spaceship interaction components and update player movement logic

This commit is contained in:
2025-05-25 19:26:41 +02:00
parent 129fc17f13
commit bac0a8c5f7
19 changed files with 286 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=42 format=3 uid="uid://bqi5s710xb1ju"]
[gd_scene load_steps=47 format=3 uid="uid://bqi5s710xb1ju"]
[ext_resource type="Script" uid="uid://ccuddyoakg04u" path="res://scripts/player.gd" id="1_8j4h4"]
[ext_resource type="Texture2D" uid="uid://b7gp0gqvkv8j4" path="res://sprites/MrBrick_base.png" id="2_bc55y"]
@@ -10,6 +10,7 @@
[ext_resource type="Script" uid="uid://qeu80jy4vmuf" path="res://scripts/components/score.gd" id="6_fowa2"]
[ext_resource type="Script" uid="uid://btfsq0bvtrx3t" path="res://scripts/components/health.gd" id="7_tqjk8"]
[ext_resource type="Script" uid="uid://dkpu3121y88oo" path="res://scripts/components/player_death.gd" id="8_1v23d"]
[ext_resource type="Texture2D" uid="uid://dhkwyv6ayb5qb" path="res://sprites/flying_ship.png" id="8_6lsog"]
[ext_resource type="PackedScene" uid="uid://dyp4i4ru2j2jh" path="res://objects/fxs/explosion_fx.tscn" id="9_hwg11"]
[ext_resource type="Script" uid="uid://nogmyshjrv57" path="res://scripts/components/knockback.gd" id="9_rjyu4"]
[ext_resource type="Script" uid="uid://ulhswh4jjlc6" path="res://scripts/components/stomp_damage_component.gd" id="12_payr4"]
@@ -32,6 +33,10 @@
[ext_resource type="PackedScene" uid="uid://b12tppjkkqpt4" path="res://objects/fxs/hit_particles.tscn" id="28_jh5m0"]
[ext_resource type="Script" uid="uid://ceq8n7yw7qxpi" path="res://scripts/components/hit_component.gd" id="29_jh5m0"]
[ext_resource type="Script" uid="uid://c1wtrgw0x77xo" path="res://scripts/components/platform_movement.gd" id="31_xoue7"]
[ext_resource type="AudioStream" uid="uid://dyev46uqusimi" path="res://sfx/shoot.wav" id="32_x2b7c"]
[ext_resource type="Script" uid="uid://d1ctdx52gskv1" path="res://scripts/components/ship_shooter.gd" id="34_gwc8i"]
[ext_resource type="PackedScene" uid="uid://dtem8jgcyoqar" path="res://objects/entities/green_laser.tscn" id="36_oxudy"]
[ext_resource type="Script" uid="uid://cfeoalic0mu2j" path="res://scripts/components/kill_player_out_of_screen.gd" id="37_oxudy"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_xoue7"]
shader = ExtResource("2_lgb3u")
@@ -77,7 +82,7 @@ scale_curve = SubResource("CurveTexture_xoue7")
color = Color(0.764706, 0.443137, 0, 1)
color_ramp = SubResource("GradientTexture1D_lgb3u")
[node name="Brick Player" type="CharacterBody2D" groups=["player"]]
[node name="Brick Player" type="CharacterBody2D" node_paths=PackedStringArray("ship_sprite") groups=["player"]]
collision_layer = 4
collision_mask = 43
script = ExtResource("1_8j4h4")
@@ -85,40 +90,49 @@ movement_types = {
"platform": NodePath("Movements/PlatformMovement"),
"ship": NodePath("Movements/ShipMovement")
}
ship_sprite = NodePath("Graphics/Ship")
[node name="Movements" type="Node" parent="."]
[node name="PlatformMovement" type="Node" parent="Movements" node_paths=PackedStringArray("jump_sfx", "rotation_target", "body")]
script = ExtResource("31_xoue7")
jump_sfx = NodePath("../../sfx_jump")
rotation_target = NodePath("../../Root/Base")
rotation_target = NodePath("../../Graphics/Root/Base")
body = NodePath("../..")
type = "platform"
[node name="ShipMovement" type="Node" parent="Movements" node_paths=PackedStringArray("body")]
script = ExtResource("3_p4n66")
acceleration = 800.0
friction = 600.0
max_speed = 360.0
acceleration = 1200.0
friction = 800.0
body = NodePath("../..")
type = "ship"
metadata/_custom_type_script = "uid://b3mrdvre1y567"
[node name="Root" type="Node2D" parent="."]
[node name="Graphics" type="Node2D" parent="."]
[node name="Base" type="Sprite2D" parent="Root"]
[node name="Root" type="Node2D" parent="Graphics"]
[node name="Base" type="Sprite2D" parent="Graphics/Root"]
material = SubResource("ShaderMaterial_xoue7")
texture = ExtResource("2_bc55y")
[node name="Left Eye" type="Sprite2D" parent="Root"]
[node name="Left Eye" type="Sprite2D" parent="Graphics/Root"]
position = Vector2(-7, -6)
texture = ExtResource("3_2srrh")
hframes = 2
[node name="Right Eye" type="Sprite2D" parent="Root"]
[node name="Right Eye" type="Sprite2D" parent="Graphics/Root"]
position = Vector2(6, -5)
texture = ExtResource("4_ccn81")
hframes = 2
[node name="Ship" type="Sprite2D" parent="Graphics"]
visible = false
position = Vector2(1, 7)
texture = ExtResource("8_6lsog")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
position = Vector2(0, 0.5)
@@ -126,8 +140,8 @@ shape = SubResource("RectangleShape2D_hdsg1")
[node name="FlipPlayerComponent" type="Node2D" parent="." node_paths=PackedStringArray("eye_left", "eye_right", "platform_movement")]
script = ExtResource("5_geu10")
eye_left = NodePath("../Root/Left Eye")
eye_right = NodePath("../Root/Right Eye")
eye_left = NodePath("../Graphics/Root/Left Eye")
eye_right = NodePath("../Graphics/Root/Right Eye")
platform_movement = NodePath("../Movements/PlatformMovement")
[node name="StompDamageArea" type="Area2D" parent="."]
@@ -167,19 +181,19 @@ flashing_component = NodePath("../FlashingComponent Base")
[node name="FlashingComponent Base" type="Node" parent="." node_paths=PackedStringArray("sprite", "health_component")]
script = ExtResource("13_hrtyn")
sprite = NodePath("../Root/Base")
sprite = NodePath("../Graphics/Root/Base")
flash_duration = 1.0
health_component = NodePath("../HealthComponent")
[node name="FlashingComponent LEye" type="Node" parent="." node_paths=PackedStringArray("sprite", "health_component")]
script = ExtResource("13_hrtyn")
sprite = NodePath("../Root/Left Eye")
sprite = NodePath("../Graphics/Root/Left Eye")
flash_duration = 1.0
health_component = NodePath("../HealthComponent")
[node name="FlashingComponent REye" type="Node" parent="." node_paths=PackedStringArray("sprite", "health_component")]
script = ExtResource("13_hrtyn")
sprite = NodePath("../Root/Right Eye")
sprite = NodePath("../Graphics/Root/Right Eye")
flash_duration = 1.0
health_component = NodePath("../HealthComponent")
@@ -199,7 +213,7 @@ skill_manager = NodePath("../SkillManager")
[node name="HitComponent" type="Node" parent="." node_paths=PackedStringArray("sprite", "health_component", "hit_fx")]
script = ExtResource("29_jh5m0")
sprite = NodePath("../Root/Base")
sprite = NodePath("../Graphics/Root/Base")
health_component = NodePath("../HealthComponent")
hit_fx = NodePath("../HitParticles")
metadata/_custom_type_script = "uid://ceq8n7yw7qxpi"
@@ -230,6 +244,10 @@ bus = &"sfx"
stream = ExtResource("20_bptj5")
bus = &"sfx"
[node name="sfx_shoot" type="AudioStreamPlayer2D" parent="."]
stream = ExtResource("32_x2b7c")
bus = &"sfx"
[node name="ChargingBarLayer" parent="." instance=ExtResource("28_3f5nm")]
offset_left = -17.0
offset_top = -30.0
@@ -239,5 +257,25 @@ offset_bottom = -20.0
[node name="HitParticles" parent="." instance=ExtResource("28_jh5m0")]
process_material = SubResource("ParticleProcessMaterial_lgb3u")
[node name="ShipShooter" type="Node" parent="." node_paths=PackedStringArray("bullet_spawn", "shoot_sfx")]
script = ExtResource("34_gwc8i")
bullet_scene = ExtResource("36_oxudy")
bullet_spawn = NodePath("../Ship shoot spawn")
shoot_sfx = NodePath("../sfx_shoot")
metadata/_custom_type_script = "uid://d1ctdx52gskv1"
[node name="Ship shoot spawn" type="Marker2D" parent="."]
position = Vector2(17, 5)
gizmo_extents = 1.0
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(0, 3)
scale = Vector2(0.8, 1.9)
[node name="KillPlayerOutOfScreen" type="Node" parent="." node_paths=PackedStringArray("screen_notifier", "health_component")]
script = ExtResource("37_oxudy")
screen_notifier = NodePath("../VisibleOnScreenNotifier2D")
health_component = NodePath("../HealthComponent")
[connection signal="on_death" from="HealthComponent" to="PlayerDeathComponent" method="_on_health_component_on_death"]
[connection signal="on_health_change" from="HealthComponent" to="KnockbackComponent" method="_on_health_component_on_health_change"]

View File

@@ -0,0 +1,8 @@
[gd_scene load_steps=2 format=3 uid="uid://bon6raeddf3tu"]
[ext_resource type="Script" uid="uid://cf4li7whw5old" path="res://scripts/components/chase_level_component.gd" id="1_ico16"]
[node name="Chaser" type="Node2D"]
[node name="ChaseLevelComponent" type="Node" parent="."]
script = ExtResource("1_ico16")

View File

@@ -0,0 +1,21 @@
[gd_scene load_steps=4 format=3 uid="uid://lpovacvt3yyj"]
[ext_resource type="Texture2D" uid="uid://dhkwyv6ayb5qb" path="res://sprites/flying_ship.png" id="1_r82pf"]
[ext_resource type="Script" uid="uid://ghb614g22ph7" path="res://scripts/components/spaceship_enter_component.gd" id="2_wanmd"]
[sub_resource type="CircleShape2D" id="CircleShape2D_wanmd"]
radius = 16.1245
[node name="Spaceship Enter" type="Area2D"]
collision_layer = 0
collision_mask = 4
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("1_r82pf")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_wanmd")
[node name="SpaceshipEnterComponent" type="Node" parent="." node_paths=PackedStringArray("area2d")]
script = ExtResource("2_wanmd")
area2d = NodePath("..")

View File

@@ -1,9 +1,10 @@
[gd_scene load_steps=20 format=4 uid="uid://fw5fbdy5gcmx"]
[gd_scene load_steps=21 format=4 uid="uid://fw5fbdy5gcmx"]
[ext_resource type="PackedScene" uid="uid://cawlpch2lk3a2" path="res://objects/level/world_environment.tscn" id="1_hb5r3"]
[ext_resource type="PackedScene" uid="uid://bqi5s710xb1ju" path="res://objects/entities/brick_player.tscn" id="1_lbnsn"]
[ext_resource type="PackedScene" uid="uid://6foggu31cu14" path="res://objects/level/ui_layer.tscn" id="2_lbnsn"]
[ext_resource type="PackedScene" uid="uid://cywsu7yrtjdog" path="res://objects/level/global_light.tscn" id="3_3732a"]
[ext_resource type="Resource" uid="uid://cqtalsov2bkpo" path="res://resources/levels/village/village_1.tres" id="4_c2yv5"]
[ext_resource type="PackedScene" uid="uid://cb0mnye1ki5a6" path="res://objects/level/camera_2d.tscn" id="5_517ha"]
[ext_resource type="Script" uid="uid://d23haq52m7ulv" path="res://addons/phantom_camera/scripts/phantom_camera/phantom_camera_2d.gd" id="6_6imqp"]
[ext_resource type="Script" uid="uid://ccfft4b8rwgbo" path="res://addons/phantom_camera/scripts/resources/tween_resource.gd" id="7_kl81p"]
@@ -54,7 +55,7 @@ ease = 2
[node name="Brick Player" parent="." instance=ExtResource("1_lbnsn")]
[node name="HitParticles" parent="Brick Player" index="26"]
[node name="HitParticles" parent="Brick Player" index="27"]
process_material = SubResource("ParticleProcessMaterial_lgb3u")
[node name="WorldEnvironment" parent="." instance=ExtResource("1_hb5r3")]
@@ -65,6 +66,7 @@ process_material = SubResource("ParticleProcessMaterial_lgb3u")
player_health = NodePath("../../Brick Player/HealthComponent")
[node name="DeathScreen" parent="UI Layer" index="1" node_paths=PackedStringArray("nodes_to_disable")]
current_level = ExtResource("4_c2yv5")
nodes_to_disable = [NodePath("../../Brick Player")]
[node name="Marketplace" parent="UI Layer" index="3" node_paths=PackedStringArray("skill_unlocker", "components_to_disable")]

View File

@@ -160,6 +160,7 @@ switch_movement={
[internationalization]
locale/translations=PackedStringArray("res://translations.en.translation", "res://translations.pl.translation")
locale/test="pl"
[layer_names]

View File

@@ -59,7 +59,7 @@ ease = 2
[node name="Brick Player" parent="." instance=ExtResource("1_dnj2y")]
z_index = 10
[node name="HitParticles" parent="Brick Player" index="26"]
[node name="HitParticles" parent="Brick Player" index="27"]
process_material = SubResource("ParticleProcessMaterial_lgb3u")
[node name="WorldEnvironment" parent="." instance=ExtResource("2_1vw1j")]

View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=28 format=4 uid="uid://chqb11pfoqmeb"]
[gd_scene load_steps=27 format=4 uid="uid://chqb11pfoqmeb"]
[ext_resource type="PackedScene" uid="uid://bqi5s710xb1ju" path="res://objects/entities/brick_player.tscn" id="1_wcma7"]
[ext_resource type="PackedScene" uid="uid://cawlpch2lk3a2" path="res://objects/level/world_environment.tscn" id="2_ot3dy"]
[ext_resource type="PackedScene" uid="uid://6foggu31cu14" path="res://objects/level/ui_layer.tscn" id="3_cjqhe"]
[ext_resource type="Script" uid="uid://cp68km8bykymb" path="res://scripts/resources/level_resource.gd" id="4_ufsbg"]
[ext_resource type="Resource" uid="uid://dlwkbjw1l33uq" path="res://resources/levels/village/village_2.tres" id="4_h4uvs"]
[ext_resource type="PackedScene" uid="uid://cywsu7yrtjdog" path="res://objects/level/global_light.tscn" id="4_wykfl"]
[ext_resource type="PackedScene" uid="uid://cb0mnye1ki5a6" path="res://objects/level/camera_2d.tscn" id="5_8nvkd"]
[ext_resource type="Script" uid="uid://d23haq52m7ulv" path="res://addons/phantom_camera/scripts/phantom_camera/phantom_camera_2d.gd" id="6_ono4h"]
@@ -51,12 +51,6 @@ scale_curve = SubResource("CurveTexture_7b7mt")
color = Color(0.764706, 0.443137, 0, 1)
color_ramp = SubResource("GradientTexture1D_f1fvy")
[sub_resource type="Resource" id="Resource_bqjcg"]
script = ExtResource("4_ufsbg")
level_name = "Village - 2 "
scene_path = ""
metadata/_custom_type_script = "uid://cp68km8bykymb"
[sub_resource type="Resource" id="Resource_0nwt7"]
script = ExtResource("7_y1tp2")
duration = 1.0
@@ -68,7 +62,7 @@ ease = 2
[node name="Brick Player" parent="." instance=ExtResource("1_wcma7")]
z_index = 1
[node name="HitParticles" parent="Brick Player" index="26"]
[node name="HitParticles" parent="Brick Player" index="27"]
process_material = SubResource("ParticleProcessMaterial_lgb3u")
[node name="WorldEnvironment" parent="." instance=ExtResource("2_ot3dy")]
@@ -79,7 +73,7 @@ process_material = SubResource("ParticleProcessMaterial_lgb3u")
player_health = NodePath("../../Brick Player/HealthComponent")
[node name="DeathScreen" parent="UI Layer" index="1" node_paths=PackedStringArray("nodes_to_disable")]
current_level = SubResource("Resource_bqjcg")
current_level = ExtResource("4_h4uvs")
nodes_to_disable = [NodePath("../../Brick Player")]
[node name="Marketplace" parent="UI Layer" index="3" node_paths=PackedStringArray("skill_unlocker", "components_to_disable")]

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=31 format=4 uid="uid://h60obxmju6mo"]
[gd_scene load_steps=32 format=4 uid="uid://h60obxmju6mo"]
[ext_resource type="PackedScene" uid="uid://dyp4i4ru2j2jh" path="res://objects/fxs/explosion_fx.tscn" id="1_p30ax"]
[ext_resource type="PackedScene" uid="uid://dx80ivlvuuew4" path="res://objects/fxs/fire_fx.tscn" id="2_a7yjf"]
@@ -17,6 +17,7 @@
[ext_resource type="PackedScene" uid="uid://d0s2abysa86rq" path="res://objects/entities/child.tscn" id="15_dv6gh"]
[ext_resource type="PackedScene" uid="uid://6foggu31cu14" path="res://objects/level/ui_layer.tscn" id="16_nr2eo"]
[ext_resource type="PackedScene" uid="uid://bqom4cm7r18db" path="res://objects/entities/killzone.tscn" id="17_3xroh"]
[ext_resource type="Resource" uid="uid://b63u5qfp8p7pv" path="res://resources/levels/village/village_3.tres" id="17_a7yjf"]
[ext_resource type="PackedScene" uid="uid://b4pdt1gv2ymyi" path="res://objects/tooltip.tscn" id="18_l3a7y"]
[ext_resource type="Script" uid="uid://8r1y8elyw7kt" path="res://scripts/console_management.gd" id="19_0pba3"]
[ext_resource type="PackedScene" uid="uid://cawlpch2lk3a2" path="res://objects/level/world_environment.tscn" id="20_embdf"]
@@ -295,7 +296,7 @@ z_index = 5
position = Vector2(903, -118)
metadata/_edit_group_ = true
[node name="HitParticles" parent="Brick Player" index="26"]
[node name="HitParticles" parent="Brick Player" index="27"]
process_material = SubResource("ParticleProcessMaterial_lgb3u")
[node name="Camera2D" parent="." instance=ExtResource("12_qhkyq")]
@@ -327,6 +328,7 @@ position = Vector2(880, -578)
player_health = NodePath("../../Brick Player/HealthComponent")
[node name="DeathScreen" parent="UI Layer" index="1" node_paths=PackedStringArray("nodes_to_disable")]
current_level = ExtResource("17_a7yjf")
nodes_to_disable = [NodePath("../../Brick Player")]
[node name="Marketplace" parent="UI Layer" index="3" node_paths=PackedStringArray("skill_unlocker", "components_to_disable")]

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,69 @@
class_name ChaseLevelComponent
extends Node
@export var chase_speed: float = 200.0
@export var chase_target: Marker2D
@export var phantom_camera: PhantomCamera2D
@export var minimum_distance: float = 10.0
signal chase_started
signal chase_stopped
var is_chasing: bool = false
var previous_camera_follow_target: Node2D = null
func _process(delta: float) -> void:
if not is_chasing:
return
if not chase_target:
printerr("ChaseLevelComponent: chase_target is not set.")
return
if check_if_reached_target():
stop_chasing()
return
var target_position: Vector2 = chase_target.global_position
var current_position: Vector2 = owner.global_position
var direction: Vector2 = (target_position - current_position).normalized()
owner.global_position += direction * chase_speed * delta
func on_ship_entered() -> void:
if not chase_target:
printerr("ChaseLevelComponent: chase_target is not set.")
return
if not phantom_camera:
printerr("ChaseLevelComponent: phantom_camera is not set.")
return
previous_camera_follow_target = phantom_camera.get_follow_target()
phantom_camera.set_follow_target(owner as Node2D)
chase_started.emit()
is_chasing = true
func on_ship_exited() -> void:
stop_chasing()
func check_if_reached_target() -> bool:
if not chase_target:
printerr("ChaseLevelComponent: chase_target is not set.")
return false
var target_position: Vector2 = chase_target.global_position
var current_position: Vector2 = owner.global_position
return current_position.distance_to(target_position) < minimum_distance
func stop_chasing() -> void:
if not phantom_camera:
printerr("ChaseLevelComponent: phantom_camera is not set.")
return
phantom_camera.set_follow_target(previous_camera_follow_target)
chase_stopped.emit()
is_chasing = false

View File

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

View File

@@ -0,0 +1,24 @@
class_name KillPlayerOutOfScreen
extends Node
@export var screen_notifier: VisibleOnScreenNotifier2D
@export var health_component: HealthComponent
func _ready() -> void:
if not screen_notifier:
printerr("KillPlayerOutOfScreen: screen_notifier is not set.")
return
if not health_component:
printerr("KillPlayerOutOfScreen: health_component is not set.")
return
screen_notifier.screen_exited.connect(out_of_screen)
func out_of_screen() -> void:
if not health_component:
return
health_component.decrease_health(6000)

View File

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

View File

@@ -19,6 +19,7 @@ func _ready() -> void:
return
area2d.body_entered.connect(_on_body_entered)
area2d.area_entered.connect(_on_area_entered)
func _on_body_entered(body: Node2D) -> void:
@@ -29,6 +30,15 @@ func _on_body_entered(body: Node2D) -> void:
activate()
func _on_area_entered(area: Area2D) -> void:
var trigger_lever: TriggerLeverComponent = area.get_node_or_null("TriggerLeverComponent")
if not trigger_lever:
return
activate()
func activate() -> void:
activated.emit()
if sfx:

View File

@@ -104,3 +104,8 @@ func handle_direction(input_dir: float) -> Vector2:
elif input_dir < 0:
return Vector2.LEFT
return last_direction
func on_ship_entered() -> void:
rotation_target.rotation = 0

View File

@@ -6,7 +6,12 @@ extends Node
@export var bullet_spawn: Marker2D
@export var shoot_sfx: AudioStreamPlayer2D
var can_shoot: bool = true
var can_shoot: bool = false
func _ready() -> void:
set_process(false)
func _process(_delta: float) -> void:
@@ -30,4 +35,16 @@ func shoot() -> void:
can_shoot = false
await get_tree().create_timer(fire_rate).timeout
can_shoot = true
can_shoot = true
func on_ship_entered():
can_shoot = true
set_process(true)
func on_ship_exited():
can_shoot = false
set_process(false)
if shoot_sfx:
shoot_sfx.stop()

View File

@@ -0,0 +1,21 @@
class_name SpaceshipEnterComponent
extends Node
@export var area2d: Area2D
signal spaceship_entered
func _ready() -> void:
if not area2d:
printerr("SpaceshipEnterComponent: area2d is not set.")
return
area2d.body_entered.connect(_on_area2d_body_entered)
func _on_area2d_body_entered(body: Node2D) -> void:
if not body is PlayerController:
return
spaceship_entered.emit()
owner.queue_free()

View File

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

View File

@@ -3,6 +3,7 @@ extends CharacterBody2D
@export var default_movement_type: String = "platform"
@export var movement_types: Dictionary = {}
@export var ship_sprite: Sprite2D
var current_movement: PlayerMovement = null
signal movement_switched(movement_type: String)
@@ -50,3 +51,14 @@ func get_next_movement_type() -> String:
current_index = (current_index + 1) % keys.size()
return keys[current_index]
func on_spaceship_entered() -> void:
switch_movement("ship")
ship_sprite.visible = true
func on_spaceship_exited() -> void:
switch_movement(default_movement_type)
ship_sprite.visible = false