Merge branch 'Book_Level_2' into dev

This commit is contained in:
Booklordofthedings 2024-08-19 10:59:56 +02:00
commit 3d787b561e
11 changed files with 202 additions and 10 deletions

View file

@ -0,0 +1,19 @@
[gd_scene load_steps=4 format=3 uid="uid://vtwswrkfkgas"]
[ext_resource type="Script" path="res://scripts/enemy_movement_mover.gd" id="1_7kapi"]
[ext_resource type="Texture2D" uid="uid://buqgl7x10et1f" path="res://temp_assets/img.png" id="1_ci3x0"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_8cnt5"]
size = Vector2(24, 20)
[node name="EnemyMover" type="CharacterBody2D"]
collision_layer = 2
collision_mask = 23
script = ExtResource("1_7kapi")
speed = 75
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("1_ci3x0")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_8cnt5")

View file

@ -3,9 +3,8 @@
[ext_resource type="Script" path="res://scripts/enemy_movement_mover.gd" id="1_7kapi"]
[ext_resource type="Texture2D" uid="uid://buqgl7x10et1f" path="res://temp_assets/img.png" id="1_ci3x0"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_duogd"]
radius = 16.0
height = 32.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_8cnt5"]
size = Vector2(24, 26)
[node name="EnemyMover" type="CharacterBody2D"]
collision_layer = 2
@ -17,4 +16,4 @@ speed = 75
texture = ExtResource("1_ci3x0")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CapsuleShape2D_duogd")
shape = SubResource("RectangleShape2D_8cnt5")

View file

@ -4,9 +4,7 @@
[ext_resource type="Texture2D" uid="uid://qcx482jc7pqr" path="res://textures/player.png" id="2_sscjv"]
[ext_resource type="Texture2D" uid="uid://bd7y5w6cfi5ly" path="res://textures/Eye Lase.png" id="3_yg3ur"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jqi2f"]
radius = 9.0
height = 22.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_31jvr"]
[sub_resource type="CircleShape2D" id="CircleShape2D_vxfel"]
radius = 12.0
@ -18,7 +16,7 @@ script = ExtResource("1_a6lhy")
jump_strength = 600
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CapsuleShape2D_jqi2f")
shape = SubResource("RectangleShape2D_31jvr")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("2_sscjv")