diff --git a/assets/graphics/environment/terrain/Terrain (32x32).png b/assets/graphics/environment/terrain/Terrain (32x32).png new file mode 100644 index 0000000..ddf1eaf Binary files /dev/null and b/assets/graphics/environment/terrain/Terrain (32x32).png differ diff --git a/assets/graphics/environment/terrain/Terrain (32x32).png.import b/assets/graphics/environment/terrain/Terrain (32x32).png.import new file mode 100644 index 0000000..48716bb --- /dev/null +++ b/assets/graphics/environment/terrain/Terrain (32x32).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bqe3w5v76lyek" +path="res://.godot/imported/Terrain (32x32).png-81a713b69add642b2640197ae95d1555.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environment/terrain/Terrain (32x32).png" +dest_files=["res://.godot/imported/Terrain (32x32).png-81a713b69add642b2640197ae95d1555.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 diff --git a/assets/graphics/player/idle/Player Idle 48x48.png b/assets/graphics/player/idle/Player Idle 48x48.png new file mode 100644 index 0000000..b618511 Binary files /dev/null and b/assets/graphics/player/idle/Player Idle 48x48.png differ diff --git a/assets/graphics/player/idle/Player Idle 48x48.png.import b/assets/graphics/player/idle/Player Idle 48x48.png.import new file mode 100644 index 0000000..1a88e4b --- /dev/null +++ b/assets/graphics/player/idle/Player Idle 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://be0vnx023iw65" +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 diff --git a/assets/graphics/player/jump_fall/player jump 48x48.png b/assets/graphics/player/jump_fall/player jump 48x48.png new file mode 100644 index 0000000..dff105c Binary files /dev/null and b/assets/graphics/player/jump_fall/player jump 48x48.png differ diff --git a/assets/graphics/player/jump_fall/player jump 48x48.png.import b/assets/graphics/player/jump_fall/player jump 48x48.png.import new file mode 100644 index 0000000..9df40a8 --- /dev/null +++ b/assets/graphics/player/jump_fall/player jump 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3uwl6agc6dhb" +path="res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/jump_fall/player jump 48x48.png" +dest_files=["res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.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 diff --git a/assets/graphics/player/run/player run 48x48.png b/assets/graphics/player/run/player run 48x48.png new file mode 100644 index 0000000..aca5b55 Binary files /dev/null and b/assets/graphics/player/run/player run 48x48.png differ diff --git a/assets/graphics/player/run/player run 48x48.png.import b/assets/graphics/player/run/player run 48x48.png.import new file mode 100644 index 0000000..7dda053 --- /dev/null +++ b/assets/graphics/player/run/player run 48x48.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dmmtik7twhga4" +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 diff --git a/scenes/game.tscn b/scenes/game.tscn index bb25d7f..3547036 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,12 +1,68 @@ -[gd_scene load_steps=9 format=3 uid="uid://coiqh7p31ukig"] +[gd_scene load_steps=12 format=3 uid="uid://coiqh7p31ukig"] [ext_resource type="Script" uid="uid://bblqtronap0j4" path="res://scripts/gamecontroller.gd" id="1_lnu2h"] [ext_resource type="PackedScene" uid="uid://dlihpyr58tqqq" path="res://scenes/crate.tscn" id="2_lbhrr"] [ext_resource type="PackedScene" uid="uid://boqg1nyudmkh4" path="res://scenes/player.tscn" id="2_lnu2h"] [ext_resource type="Script" uid="uid://d1daji4xwuj03" path="res://scripts/scene_manager.gd" id="2_p57ef"] [ext_resource type="PackedScene" uid="uid://csotsc2cycyia" path="res://scenes/trigger.tscn" id="2_yqjtg"] +[ext_resource type="Texture2D" uid="uid://bqe3w5v76lyek" path="res://assets/graphics/environment/terrain/Terrain (32x32).png" id="3_u5sy4"] [ext_resource type="PackedScene" uid="uid://dopt3unflv7l3" path="res://scenes/bullet.tscn" id="5_iywne"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_gee14"] +texture = ExtResource("3_u5sy4") +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_0tnpc"] +tile_size = Vector2i(32, 32) +sources/0 = SubResource("TileSetAtlasSource_gee14") + [sub_resource type="RectangleShape2D" id="RectangleShape2D_8cj0n"] size = Vector2(44, 20) @@ -19,8 +75,13 @@ script = ExtResource("1_lnu2h") unique_name_in_owner = true script = ExtResource("2_p57ef") +[node name="TileMapLayer" type="TileMapLayer" parent="."] +texture_filter = 1 +tile_map_data = PackedByteArray(0, 0, 17, 0, 12, 0, 0, 0, 4, 0, 4, 0, 0, 0, 18, 0, 12, 0, 0, 0, 4, 0, 4, 0, 0, 0) +tile_set = SubResource("TileSet_0tnpc") + [node name="StaticBody2D" type="StaticBody2D" parent="."] -position = Vector2(567, 402) +position = Vector2(567, 395) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] @@ -37,12 +98,15 @@ metadata/_edit_group_ = true shape = SubResource("WorldBoundaryShape2D_8cj0n") [node name="Player" parent="." instance=ExtResource("2_lnu2h")] -position = Vector2(567, 380) - -[node name="Area2D" parent="." instance=ExtResource("2_yqjtg")] -position = Vector2(564, 436) +position = Vector2(566, 374) [node name="Bullet" parent="." instance=ExtResource("5_iywne")] position = Vector2(351, 312) -[connection signal="areaTriggerSignal" from="Area2D" to="." method="_on_trigger"] +[node name="triggers" type="Node2D" parent="."] + +[node name="player_hurt" parent="triggers" instance=ExtResource("2_yqjtg")] +position = Vector2(428, 547) +effect = "player_hurt" + +[connection signal="areaTriggerSignal" from="triggers/player_hurt" to="." method="_on_trigger"] diff --git a/scenes/player.tscn b/scenes/player.tscn index c63bfbb..10209ee 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,182 @@ -[gd_scene load_steps=3 format=3 uid="uid://boqg1nyudmkh4"] +[gd_scene load_steps=28 format=3 uid="uid://boqg1nyudmkh4"] [ext_resource type="Script" uid="uid://b7rahgxxw1yuw" path="res://scripts/player.gd" id="1_3vyb7"] +[ext_resource type="Texture2D" uid="uid://c3uwl6agc6dhb" path="res://assets/graphics/player/jump_fall/player jump 48x48.png" id="2_dqkch"] +[ext_resource type="Texture2D" uid="uid://be0vnx023iw65" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_g2els"] +[ext_resource type="Texture2D" uid="uid://dmmtik7twhga4" path="res://assets/graphics/player/run/player run 48x48.png" id="3_qhqgy"] [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": 5.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"] script = ExtResource("1_3vyb7") metadata/_edit_group_ = true @@ -23,3 +196,16 @@ position = Vector2(13, -6) [node name="LeftSpawn" type="Node2D" parent="."] position = Vector2(-13, -7) + +[node name="JumpBufferTimer" type="Timer" parent="."] +wait_time = 0.8 +one_shot = true + +[node name="PlayerGraphic" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -7) +sprite_frames = SubResource("SpriteFrames_jej6c") +animation = &"fall" +autoplay = "idle" + +[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_animation_finished"] diff --git a/scripts/gamecontroller.gd b/scripts/gamecontroller.gd index b21dd80..86b9cfb 100644 --- a/scripts/gamecontroller.gd +++ b/scripts/gamecontroller.gd @@ -1,6 +1,6 @@ extends Node2D - +signal playerDamage # Called when the node enters the scene tree for the first time. func _ready() -> void: pass # Replace with function body. @@ -13,6 +13,11 @@ func _process(delta: float) -> void: func _on_trigger(effect: Variant, body: Variant) -> void: print("GC sees trigger "+effect) + match effect: + "player_hurt": + if body is Player: + print("hurt the player") + playerDamage.emit() if not body is Player: body.queue_free() diff --git a/scripts/player.gd b/scripts/player.gd index 35f73be..bf1aeef 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -4,13 +4,19 @@ class_name Player extends CharacterBody2D @onready var left_cast: RayCast2D = $LeftCast @onready var right_spawn: Node2D = $RightSpawn @onready var left_spawn: Node2D = $LeftSpawn +@onready var jump_buffer_timer: Timer = $JumpBufferTimer +@onready var player_graphic: AnimatedSprite2D = $PlayerGraphic const SPEED = 300.0 const JUMP_VELOCITY = -400.0 +@export var acceleration:int = 5 +var upJump:bool = false var direction enum FaceDirection{LEFT, RIGHT} var facing:FaceDirection = FaceDirection.RIGHT +enum State{IDLE, RUN,JUMP,FALLING} +var current_state:State = State.IDLE var pushTarget var pushEnabled := false @@ -19,26 +25,69 @@ func _physics_process(delta: float) -> void: # Add the gravity. handle_input() handle_movement(delta) + handle_states() + handle_animation() move_and_slide() 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 + #player steps off ledge + 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: - if direction: - velocity.x = direction * SPEED + if direction == 0: + #not moving + velocity.x = move_toward(velocity.x,0, acceleration) else: - velocity.x = move_toward(velocity.x, 0, SPEED) + velocity.x = move_toward(velocity.x, SPEED * direction, acceleration) if not is_on_floor(): 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(): 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") if direction < 0: facing = FaceDirection.LEFT + player_graphic.flip_h = true if direction > 0: facing = FaceDirection.RIGHT + player_graphic.flip_h = false + if Input.is_action_just_pressed("shove") && pushEnabled: var shoveDirection:int match facing: @@ -76,3 +125,9 @@ func handle_collisions(): if not right_cast.is_colliding() && not left_cast.is_colliding(): pushEnabled = false + + +func _on_animation_finished() -> void: + match current_state: + State.JUMP: + upJump = false diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index a24c475..83bdede 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -3,10 +3,14 @@ var bulletArray =[] var totalAllowedBullets = 7 var bullet = preload("res://scenes/bullet.tscn") @onready var game: Node2D = $".." +@onready var triggers: Node2D = $"../triggers" # Called when the node enters the scene tree for the first time. 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. diff --git a/scripts/trigger.gd b/scripts/trigger.gd index f944af9..c1fc962 100644 --- a/scripts/trigger.gd +++ b/scripts/trigger.gd @@ -1,4 +1,4 @@ -extends Area2D +class_name Trigger extends Area2D @export var effect := "destroy"