tilemap layer, state maschine, scenemanager, animations, accel

This commit is contained in:
Jdevadas 2025-08-18 21:10:32 -04:00
parent 309f5f9941
commit 25527f75d8
21 changed files with 487 additions and 33 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cfoysdgyt6nar"
path="res://.godot/imported/Terrain (32x32)(1).png-f30083663c5b61a547e537b745ce35df.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/environment/terrain/Terrain (32x32)(1).png"
dest_files=["res://.godot/imported/Terrain (32x32)(1).png-f30083663c5b61a547e537b745ce35df.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://djtlpe43a18d5"
path="res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/idle/Player Idle 48x48.png"
dest_files=["res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 1021 B

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://daf4mmxa2xsjv"
path="res://.godot/imported/player jump 48x48(1).png-fce213ffe532f989157ffbd1a1791539.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/jump_fall/player jump 48x48(1).png"
dest_files=["res://.godot/imported/player jump 48x48(1).png-fce213ffe532f989157ffbd1a1791539.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dctuuekg8fi6i"
path="res://.godot/imported/player run 48x48.png-6d66612d48bfa4c8721495ba557ab7c6.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/graphics/player/run/player run 48x48.png"
dest_files=["res://.godot/imported/player run 48x48.png-6d66612d48bfa4c8721495ba557ab7c6.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@ -12,7 +12,7 @@ config_version=5
config/name="JulyGame" config/name="JulyGame"
run/main_scene="res://scenes/game.tscn" run/main_scene="res://scenes/game.tscn"
config/features=PackedStringArray("4.3", "Forward Plus") config/features=PackedStringArray("4.4", "Forward Plus")
config/icon="res://icon.svg" config/icon="res://icon.svg"
[input] [input]

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://lg8k51aicde4"] [gd_scene load_steps=3 format=3 uid="uid://lg8k51aicde4"]
[ext_resource type="Script" path="res://scripts/bullet.gd" id="1_bpcfw"] [ext_resource type="Script" uid="uid://p7brl4n4miw6" path="res://scripts/bullet.gd" id="1_bpcfw"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_oprgb"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_oprgb"]
size = Vector2(8, 4) size = Vector2(8, 4)

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://d0mw3eh00s3kr"] [gd_scene load_steps=3 format=3 uid="uid://d0mw3eh00s3kr"]
[ext_resource type="Script" path="res://scripts/crate.gd" id="1_j2btj"] [ext_resource type="Script" uid="uid://bv1u5eyjco2m8" path="res://scripts/crate.gd" id="1_j2btj"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_uwrxv"]

View File

@ -1,11 +1,66 @@
[gd_scene load_steps=9 format=3 uid="uid://doctwh8lc63y5"] [gd_scene load_steps=11 format=3 uid="uid://doctwh8lc63y5"]
[ext_resource type="Script" path="res://scripts/gamecontroller.gd" id="1_lnu2h"] [ext_resource type="Script" uid="uid://cpua8fr5bby78" path="res://scripts/gamecontroller.gd" id="1_lnu2h"]
[ext_resource type="PackedScene" uid="uid://b5p1mlv4c1olv" path="res://scenes/player.tscn" id="2_5tj0f"] [ext_resource type="PackedScene" uid="uid://b5p1mlv4c1olv" path="res://scenes/player.tscn" id="2_5tj0f"]
[ext_resource type="Script" path="res://scripts/scene_manager.gd" id="2_w84c1"] [ext_resource type="Script" uid="uid://chu805lvjnh7s" path="res://scripts/scene_manager.gd" id="2_w84c1"]
[ext_resource type="PackedScene" uid="uid://6n3305pqp43a" path="res://scenes/trigger.tscn" id="2_yqjtg"] [ext_resource type="PackedScene" uid="uid://6n3305pqp43a" path="res://scenes/trigger.tscn" id="2_yqjtg"]
[ext_resource type="Texture2D" uid="uid://cfoysdgyt6nar" path="res://assets/graphics/environment/terrain/Terrain (32x32)(1).png" id="4_p57ef"]
[ext_resource type="PackedScene" uid="uid://d0mw3eh00s3kr" path="res://scenes/crate.tscn" id="4_syc2o"] [ext_resource type="PackedScene" uid="uid://d0mw3eh00s3kr" path="res://scenes/crate.tscn" id="4_syc2o"]
[ext_resource type="PackedScene" uid="uid://lg8k51aicde4" path="res://scenes/bullet.tscn" id="5_3trti"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u5sy4"]
texture = ExtResource("4_p57ef")
texture_region_size = Vector2i(32, 32)
0:0/0 = 0
1:0/0 = 0
2:0/0 = 0
4:0/0 = 0
6:0/0 = 0
7:0/0 = 0
9:0/0 = 0
10:0/0 = 0
12:0/0 = 0
13:0/0 = 0
15:0/0 = 0
0:1/0 = 0
1:1/0 = 0
2:1/0 = 0
4:1/0 = 0
6:1/0 = 0
7:1/0 = 0
9:1/0 = 0
10:1/0 = 0
12:1/0 = 0
13:1/0 = 0
15:1/0 = 0
16:1/0 = 0
0:2/0 = 0
1:2/0 = 0
2:2/0 = 0
4:2/0 = 0
6:3/0 = 0
7:3/0 = 0
9:3/0 = 0
10:3/0 = 0
12:3/0 = 0
13:3/0 = 0
15:3/0 = 0
16:3/0 = 0
0:4/0 = 0
1:4/0 = 0
2:4/0 = 0
4:4/0 = 0
6:4/0 = 0
7:4/0 = 0
9:4/0 = 0
10:4/0 = 0
12:4/0 = 0
13:4/0 = 0
15:4/0 = 0
16:4/0 = 0
[sub_resource type="TileSet" id="TileSet_gee14"]
tile_size = Vector2i(32, 32)
sources/0 = SubResource("TileSetAtlasSource_u5sy4")
[sub_resource type="RectangleShape2D" id="RectangleShape2D_8cj0n"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_8cj0n"]
size = Vector2(52, 20) size = Vector2(52, 20)
@ -19,8 +74,17 @@ script = ExtResource("1_lnu2h")
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("2_w84c1") script = ExtResource("2_w84c1")
[node name="Player" parent="." instance=ExtResource("2_5tj0f")]
position = Vector2(580, 368)
[node name="TileMapLayer" type="TileMapLayer" parent="."]
texture_filter = 1
tile_map_data = PackedByteArray(0, 0, 17, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 18, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 19, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0, 20, 0, 13, 0, 0, 0, 4, 0, 4, 0, 0, 0)
tile_set = SubResource("TileSet_gee14")
[node name="StaticBody2D" type="StaticBody2D" parent="."] [node name="StaticBody2D" type="StaticBody2D" parent="."]
position = Vector2(580, 413) position = Vector2(610, 430)
scale = Vector2(2.47859, 1.32127)
metadata/_edit_group_ = true metadata/_edit_group_ = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
@ -33,19 +97,25 @@ metadata/_edit_group_ = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="ground"] [node name="CollisionShape2D" type="CollisionShape2D" parent="ground"]
shape = SubResource("WorldBoundaryShape2D_8cj0n") shape = SubResource("WorldBoundaryShape2D_8cj0n")
[node name="Player" parent="." instance=ExtResource("2_5tj0f")]
position = Vector2(580, 368)
[node name="Area2D" parent="." instance=ExtResource("2_yqjtg")]
position = Vector2(872, 521)
[node name="Crate" parent="." instance=ExtResource("4_syc2o")] [node name="Crate" parent="." instance=ExtResource("4_syc2o")]
position = Vector2(592, 261) position = Vector2(592, 261)
[node name="trigger" parent="." instance=ExtResource("2_yqjtg")] [node name="Crate2" parent="." instance=ExtResource("4_syc2o")]
position = Vector2(554, 287)
[node name="Crate3" parent="." instance=ExtResource("4_syc2o")]
position = Vector2(671, 320)
[node name="Crate4" parent="." instance=ExtResource("4_syc2o")]
position = Vector2(640, 382)
[node name="triggers" type="Node2D" parent="."]
[node name="player hurt" parent="triggers" instance=ExtResource("2_yqjtg")]
position = Vector2(872, 521)
effect = "player_hurt"
[node name="trigger" parent="triggers" instance=ExtResource("2_yqjtg")]
position = Vector2(389, 519) position = Vector2(389, 519)
[node name="Bullet" parent="." instance=ExtResource("5_3trti")] [connection signal="areaTriggerSignal" from="triggers/player hurt" to="." method="_on_trigger"]
position = Vector2(433, 332)
[connection signal="areaTriggerSignal" from="Area2D" to="." method="_on_trigger"]

View File

@ -1,9 +1,182 @@
[gd_scene load_steps=3 format=3 uid="uid://b5p1mlv4c1olv"] [gd_scene load_steps=28 format=3 uid="uid://b5p1mlv4c1olv"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_bqfhv"] [ext_resource type="Script" uid="uid://cnwga6l2btdbk" path="res://scripts/player.gd" id="1_bqfhv"]
[ext_resource type="Texture2D" uid="uid://daf4mmxa2xsjv" path="res://assets/graphics/player/jump_fall/player jump 48x48(1).png" id="2_dqkch"]
[ext_resource type="Texture2D" uid="uid://djtlpe43a18d5" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_g2els"]
[ext_resource type="Texture2D" uid="uid://dctuuekg8fi6i" path="res://assets/graphics/player/run/player run 48x48.png" id="3_qhqgy"]
[sub_resource type="CircleShape2D" id="CircleShape2D_8cj0n"] [sub_resource type="CircleShape2D" id="CircleShape2D_8cj0n"]
[sub_resource type="AtlasTexture" id="AtlasTexture_i4ail"]
atlas = ExtResource("2_dqkch")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_qhqgy"]
atlas = ExtResource("2_g2els")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_dqkch"]
atlas = ExtResource("2_g2els")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_qlg0r"]
atlas = ExtResource("2_g2els")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_tuyoq"]
atlas = ExtResource("2_g2els")
region = Rect2(144, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_fjrip"]
atlas = ExtResource("2_g2els")
region = Rect2(192, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_smehm"]
atlas = ExtResource("2_g2els")
region = Rect2(240, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_ur7pv"]
atlas = ExtResource("2_g2els")
region = Rect2(288, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_y4r1p"]
atlas = ExtResource("2_g2els")
region = Rect2(336, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_d2wvv"]
atlas = ExtResource("2_g2els")
region = Rect2(384, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_3v2ag"]
atlas = ExtResource("2_g2els")
region = Rect2(432, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_a38lo"]
atlas = ExtResource("2_dqkch")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_4ni07"]
atlas = ExtResource("2_dqkch")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_jej6c"]
atlas = ExtResource("3_qhqgy")
region = Rect2(0, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_f1ej7"]
atlas = ExtResource("3_qhqgy")
region = Rect2(48, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_oprun"]
atlas = ExtResource("3_qhqgy")
region = Rect2(96, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_a8ls1"]
atlas = ExtResource("3_qhqgy")
region = Rect2(144, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_qfm1y"]
atlas = ExtResource("3_qhqgy")
region = Rect2(192, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_fulsm"]
atlas = ExtResource("3_qhqgy")
region = Rect2(240, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_4r5pv"]
atlas = ExtResource("3_qhqgy")
region = Rect2(288, 0, 48, 48)
[sub_resource type="AtlasTexture" id="AtlasTexture_60mlk"]
atlas = ExtResource("3_qhqgy")
region = Rect2(336, 0, 48, 48)
[sub_resource type="SpriteFrames" id="SpriteFrames_jej6c"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_i4ail")
}],
"loop": false,
"name": &"fall",
"speed": 2.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_qhqgy")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_dqkch")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qlg0r")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tuyoq")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_fjrip")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_smehm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ur7pv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_y4r1p")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_d2wvv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3v2ag")
}],
"loop": true,
"name": &"idle",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_a38lo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4ni07")
}],
"loop": false,
"name": &"jump",
"speed": 12.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_jej6c")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f1ej7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_oprun")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_a8ls1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qfm1y")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_fulsm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4r5pv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_60mlk")
}],
"loop": true,
"name": &"run",
"speed": 12.0
}]
[node name="Player" type="CharacterBody2D"] [node name="Player" type="CharacterBody2D"]
script = ExtResource("1_bqfhv") script = ExtResource("1_bqfhv")
metadata/_edit_group_ = true metadata/_edit_group_ = true
@ -23,3 +196,16 @@ position = Vector2(12, -7)
[node name="LeftSpawn" type="Node2D" parent="."] [node name="LeftSpawn" type="Node2D" parent="."]
position = Vector2(-12, -7) position = Vector2(-12, -7)
[node name="jumpBufferTimer" type="Timer" parent="."]
wait_time = 1.5
one_shot = true
[node name="PlayerGraphic" type="AnimatedSprite2D" parent="."]
texture_filter = 1
position = Vector2(2, -7)
sprite_frames = SubResource("SpriteFrames_jej6c")
animation = &"jump"
autoplay = "idle"
[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"]

View File

@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://6n3305pqp43a"] [gd_scene load_steps=3 format=3 uid="uid://6n3305pqp43a"]
[ext_resource type="Script" path="res://scripts/trigger.gd" id="1_du5ex"] [ext_resource type="Script" uid="uid://c57chsew3r87y" path="res://scripts/trigger.gd" id="1_du5ex"]
[sub_resource type="CircleShape2D" id="CircleShape2D_uwrxv"] [sub_resource type="CircleShape2D" id="CircleShape2D_uwrxv"]

1
scripts/bullet.gd.uid Normal file
View File

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

1
scripts/crate.gd.uid Normal file
View File

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

View File

@ -1,6 +1,6 @@
extends Node2D extends Node2D
signal playerDamage
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
pass # Replace with function body. pass # Replace with function body.
@ -13,6 +13,11 @@ func _process(delta: float) -> void:
func _on_trigger(effect: Variant, body:Variant) -> void: func _on_trigger(effect: Variant, body:Variant) -> void:
print("GC sees trigger "+effect) print("GC sees trigger "+effect)
match effect:
"player_hurt":
if body is Player:
print("ouch")
playerDamage.emit()
if not body is Player: if not body is Player:
body.queue_free() body.queue_free()

View File

@ -4,14 +4,20 @@ class_name Player extends CharacterBody2D
@onready var left_cast: RayCast2D = $LeftCast @onready var left_cast: RayCast2D = $LeftCast
@onready var right_spawn: Node2D = $RightSpawn @onready var right_spawn: Node2D = $RightSpawn
@onready var left_spawn: Node2D = $LeftSpawn @onready var left_spawn: Node2D = $LeftSpawn
@onready var jump_buffer_timer: Timer = $jumpBufferTimer
@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic
const SPEED = 300.0 const SPEED = 300
const JUMP_VELOCITY = -400.0 const JUMP_VELOCITY = -400.0
@export var acceleration:int = 5
var upJump:bool = false
var direction var direction
enum FaceDirection{LEFT, RIGHT} enum FaceDirection{LEFT, RIGHT}
var facing:FaceDirection = FaceDirection.RIGHT var facing:FaceDirection = FaceDirection.RIGHT
enum State{IDLE,RUN,JUMP,FALLING}
var current_state:State = State.IDLE
var pushTarget var pushTarget
var pushEnabled := false var pushEnabled := false
@ -22,26 +28,64 @@ func _physics_process(delta:float) -> void:
handle_input() handle_input()
handle_movement(delta) handle_movement(delta)
handle_states()
handle_animation()
move_and_slide() move_and_slide()
handle_collisions() handle_collisions()
func handle_states() -> void:
match current_state:
State.IDLE when velocity.x !=0:
current_state = State.RUN
State.RUN:
if velocity.x == 0:
current_state = State.IDLE
if not is_on_floor() && velocity.y > 0:
current_state = State.FALLING
State.FALLING when is_on_floor():
if velocity.x == 0:
current_state = State.IDLE
else:
current_state = State.RUN
State.JUMP when velocity.y >0:
current_state = State.FALLING
func handle_animation() -> void:
match current_state:
State.IDLE:
player_graphic.play("idle")
State.RUN:
player_graphic.play("run")
State.FALLING:
player_graphic.play("fall")
State.JUMP:
if upJump:
player_graphic.play("jump")
func handle_movement(delta:float) -> void: func handle_movement(delta:float) -> void:
if direction == 0:
if direction: #not moving
velocity.x = direction * SPEED velocity.x = move_toward(velocity.x,0, acceleration)
else: else:
velocity.x = move_toward(velocity.x, 0, SPEED) velocity.x = move_toward(velocity.x,SPEED * direction, acceleration)
if not is_on_floor(): if not is_on_floor():
velocity += get_gravity() * delta velocity += get_gravity() * delta
if is_on_floor() && jump_buffer_timer.time_left >0:
velocity.y = JUMP_VELOCITY
jump_buffer_timer.stop()
current_state = State.JUMP
upJump = true
func handle_input(): func handle_input():
if Input.is_action_just_pressed("ui_accept") and is_on_floor(): if Input.is_action_just_pressed("ui_accept") and is_on_floor():
velocity.y = JUMP_VELOCITY #velocity.y = JUMP_VELOCITY
jump_buffer_timer.start()
direction = Input.get_axis("ui_left", "ui_right") direction = Input.get_axis("ui_left", "ui_right")
if direction <0: if direction <0:
facing =FaceDirection.LEFT facing =FaceDirection.LEFT
player_graphic.flip_h = true
if direction > 0: if direction > 0:
facing = FaceDirection.RIGHT facing = FaceDirection.RIGHT
player_graphic.flip_h = false
if Input.is_action_just_pressed("shove") && pushEnabled: if Input.is_action_just_pressed("shove") && pushEnabled:
var shoveDirection:int var shoveDirection:int
match facing: match facing:
@ -80,3 +124,9 @@ func handle_collisions():
pushEnabled = true pushEnabled = true
if not right_cast.is_colliding() && not left_cast.is_colliding(): if not right_cast.is_colliding() && not left_cast.is_colliding():
pushEnabled = false pushEnabled = false
func _on_animation_finished() -> void:
match current_state:
State.JUMP:
upJump = false

View File

@ -3,10 +3,14 @@ var bulletArray = []
var totalAllowedBullets = 7 var totalAllowedBullets = 7
var bullet = preload("res://scenes/bullet.tscn") var bullet = preload("res://scenes/bullet.tscn")
@onready var game: Node2D = $".." @onready var game: Node2D = $".."
@onready var triggers: Node2D = $"../triggers"
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
pass # Replace with function body. if triggers:
for obj in triggers.get_children():
if obj is Trigger:
obj.areaTriggerSignal.connect(game._on_trigger)
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.

View File

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

View File

@ -1,4 +1,4 @@
extends Area2D class_name Trigger extends Area2D
@export var effect := "destroy" @export var effect := "destroy"