From 7d3e6ccc2a33084d8ae41168caab137b1980756a Mon Sep 17 00:00:00 2001 From: Booklordofthedings Date: Sat, 17 Aug 2024 17:33:34 +0200 Subject: [PATCH] level changes --- gmtk_2024/levels/LevelBase.tscn | 1 + gmtk_2024/levels/TestingField.tscn | 19 +++++++++++++++---- gmtk_2024/objects/EnemyMover.tscn | 3 +++ gmtk_2024/objects/Player.tscn | 17 +++++++++++++++-- gmtk_2024/project.godot | 8 ++++---- gmtk_2024/scripts/enemy_movement_mover.gd | 3 +-- gmtk_2024/scripts/player_movement.gd | 4 ++++ 7 files changed, 43 insertions(+), 12 deletions(-) diff --git a/gmtk_2024/levels/LevelBase.tscn b/gmtk_2024/levels/LevelBase.tscn index 176d93a..86d6145 100644 --- a/gmtk_2024/levels/LevelBase.tscn +++ b/gmtk_2024/levels/LevelBase.tscn @@ -73,6 +73,7 @@ texture_focused = ExtResource("8_r6dd1") [node name="Camera2D" type="Camera2D" parent="."] [node name="Walls" type="StaticBody2D" parent="."] +collision_mask = 6 [node name="Ground" type="CollisionShape2D" parent="Walls"] position = Vector2(0.5, 394.25) diff --git a/gmtk_2024/levels/TestingField.tscn b/gmtk_2024/levels/TestingField.tscn index 9c3b61b..2a2a8a9 100644 --- a/gmtk_2024/levels/TestingField.tscn +++ b/gmtk_2024/levels/TestingField.tscn @@ -2,9 +2,9 @@ [ext_resource type="PackedScene" uid="uid://ba6afuig8bqrg" path="res://levels/LevelBase.tscn" id="1_ad6qp"] [ext_resource type="Shader" path="res://shaders/scrolling.gdshader" id="2_60gse"] -[ext_resource type="Texture2D" uid="uid://b2vqx11kx16u" path="res://textures/Level 01.png" id="2_gi0pl"] -[ext_resource type="Texture2D" uid="uid://51ffxb41mud6" path="res://textures/level01-spritesheet.png" id="3_3ou1v"] -[ext_resource type="PackedScene" path="res://objects/EnemyMover.tscn" id="4_3fnma"] +[ext_resource type="Texture2D" uid="uid://bki6ucvk6bjwk" path="res://textures/Level 01.png" id="2_gi0pl"] +[ext_resource type="Texture2D" uid="uid://c35kb2k4l1ku" path="res://textures/level01-spritesheet.png" id="3_3ou1v"] +[ext_resource type="PackedScene" uid="uid://vtwswrkfkgas" path="res://objects/EnemyMover.tscn" id="4_3fnma"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] texture = ExtResource("3_3ou1v") @@ -132,7 +132,7 @@ tile_map_data = PackedByteArray("AADt/wsAAAABAAAAAADu/wsAAAABAAAAAADv/wsAAAABAAA tile_set = SubResource("TileSet_n3khe") [node name="EnemyMover" parent="." index="6" instance=ExtResource("4_3fnma")] -position = Vector2(-303, 72) +position = Vector2(-579, 77) [node name="TextureRect" type="TextureRect" parent="." index="7"] z_index = -100 @@ -148,3 +148,14 @@ grow_horizontal = 2 grow_vertical = 2 texture = ExtResource("2_gi0pl") stretch_mode = 1 + +[node name="EnemyMover2" parent="." index="8" instance=ExtResource("4_3fnma")] +position = Vector2(-240, 77) + +[node name="EnemyMover3" parent="." index="9" instance=ExtResource("4_3fnma")] +position = Vector2(577, 269) +direction = -1 + +[node name="EnemyMover4" parent="." index="10" instance=ExtResource("4_3fnma")] +position = Vector2(-78, -280) +direction = -1 diff --git a/gmtk_2024/objects/EnemyMover.tscn b/gmtk_2024/objects/EnemyMover.tscn index 54c649d..5e955de 100644 --- a/gmtk_2024/objects/EnemyMover.tscn +++ b/gmtk_2024/objects/EnemyMover.tscn @@ -8,7 +8,10 @@ radius = 16.0 height = 32.0 [node name="EnemyMover" type="CharacterBody2D"] +collision_layer = 2 +collision_mask = 7 script = ExtResource("1_7kapi") +speed = 75 [node name="Sprite2D" type="Sprite2D" parent="."] texture = ExtResource("1_ci3x0") diff --git a/gmtk_2024/objects/Player.tscn b/gmtk_2024/objects/Player.tscn index 13ce4dc..add58c3 100644 --- a/gmtk_2024/objects/Player.tscn +++ b/gmtk_2024/objects/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://snxpqx0ony7s"] +[gd_scene load_steps=5 format=3 uid="uid://snxpqx0ony7s"] [ext_resource type="Script" path="res://scripts/player_movement.gd" id="1_a6lhy"] [ext_resource type="Texture2D" uid="uid://qcx482jc7pqr" path="res://textures/player.png" id="2_sscjv"] @@ -7,9 +7,13 @@ radius = 9.0 height = 22.0 +[sub_resource type="CircleShape2D" id="CircleShape2D_vxfel"] +radius = 12.0 + [node name="Player" type="CharacterBody2D"] +collision_layer = 4 +collision_mask = 3 script = ExtResource("1_a6lhy") -jump_count = 1 jump_strength = 600 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] @@ -17,3 +21,12 @@ shape = SubResource("CapsuleShape2D_jqi2f") [node name="Sprite2D" type="Sprite2D" parent="."] texture = ExtResource("2_sscjv") + +[node name="Hurtbox" type="Area2D" parent="."] +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox"] +shape = SubResource("CircleShape2D_vxfel") + +[connection signal="body_entered" from="Hurtbox" to="." method="_on_hurtbox_body_entered"] diff --git a/gmtk_2024/project.godot b/gmtk_2024/project.godot index bdacb8d..3d00d7f 100644 --- a/gmtk_2024/project.godot +++ b/gmtk_2024/project.godot @@ -42,10 +42,10 @@ player_jump={ [layer_names] -2d_render/layer_1="Ground" -2d_render/layer_2="Enemies" -2d_render/layer_3="Player" -2d_render/layer_4="Goal" +2d_physics/layer_1="Ground" +2d_physics/layer_2="Enemies" +2d_physics/layer_3="Player" +2d_physics/layer_4="Goal" [rendering] diff --git a/gmtk_2024/scripts/enemy_movement_mover.gd b/gmtk_2024/scripts/enemy_movement_mover.gd index 1c48235..761e5eb 100644 --- a/gmtk_2024/scripts/enemy_movement_mover.gd +++ b/gmtk_2024/scripts/enemy_movement_mover.gd @@ -2,8 +2,7 @@ extends CharacterBody2D @export var speed = 200; @export var gravity = 50; - -var direction = 1; +@export var direction = 1; func _physics_process(delta): diff --git a/gmtk_2024/scripts/player_movement.gd b/gmtk_2024/scripts/player_movement.gd index c3034c6..191894b 100644 --- a/gmtk_2024/scripts/player_movement.gd +++ b/gmtk_2024/scripts/player_movement.gd @@ -60,3 +60,7 @@ func Jump(): velocity.y = -1 * jump_strength jump_count = 0 is_touching_floor = false + + +func _on_hurtbox_body_entered(body: Node2D) -> void: + get_tree().reload_current_scene()