Merge branch 'main' into custom-level-loading-rewrite

This commit is contained in:
JHDev2006
2025-10-26 12:33:16 +00:00
158 changed files with 2106 additions and 1148 deletions

View File

@@ -0,0 +1,24 @@
[gd_scene load_steps=6 format=3 uid="uid://d3ptkkqrbxti7"]
[ext_resource type="PackedScene" uid="uid://bn1kect7h2dlp" path="res://Scenes/Prefabs/LevelObjects/BulletBillGenerator.tscn" id="1_tqe64"]
[ext_resource type="PackedScene" uid="uid://d04e1qv3si8j" path="res://Scenes/Prefabs/Entities/Enemies/RedCheepCheep.tscn" id="2_thtyo"]
[ext_resource type="Texture2D" uid="uid://cd8q0nuveukv1" path="res://Assets/Sprites/Editor/CheepCheepSideGenerator.png" id="3_nd37u"]
[ext_resource type="Script" uid="uid://bq0pc2vhp35t2" path="res://Scripts/Parts/EntityGenerator.gd" id="4_nd37u"]
[ext_resource type="PackedScene" uid="uid://bdirphnfabey8" path="res://Scenes/Prefabs/Entities/Enemies/GreenCheepCheep.tscn" id="5_d47d1"]
[node name="EntityGenerator" instance=ExtResource("1_tqe64")]
threshold = 4.0
y_pos = 1
entity_scene = ExtResource("2_thtyo")
[node name="Sprite" parent="LevelEditorVisibleNode" index="0"]
texture = ExtResource("3_nd37u")
[node name="EntityGenerator" type="Node2D" parent="." index="2"]
script = ExtResource("4_nd37u")
threshold = 3.0
y_pos = 1
entity_scene = ExtResource("5_d47d1")
metadata/_custom_type_script = "uid://bq0pc2vhp35t2"
[connection signal="activated" from="." to="EntityGenerator" method="activate"]

View File

@@ -1,8 +1,7 @@
[gd_scene load_steps=24 format=3 uid="uid://c6loucilra6da"]
[gd_scene load_steps=22 format=3 uid="uid://c6loucilra6da"]
[ext_resource type="Script" uid="uid://dwfnvpioh2kvi" path="res://Scripts/Parts/EndFlagpole.gd" id="1_3rtm4"]
[ext_resource type="Texture2D" uid="uid://3vg41a5plc4e" path="res://Assets/Sprites/Tilesets/FlagPole.png" id="1_hnd65"]
[ext_resource type="Script" uid="uid://cnheej0sxmoxg" path="res://Scripts/Parts/PlayerDetection.gd" id="4_62gix"]
[ext_resource type="JSON" path="res://Assets/Sprites/Tilesets/FlagPole.json" id="4_nykv5"]
[ext_resource type="Script" uid="uid://5octqlf4ohel" path="res://Scripts/Classes/Components/ScoreNoteSpawner.gd" id="5_dm4yn"]
[ext_resource type="Script" uid="uid://cmvlgsjmsk0v5" path="res://Scripts/Classes/Resources/ThemedResource.gd" id="5_jihtx"]
@@ -57,9 +56,6 @@ _data = {
&"RESET": SubResource("Animation_xwflf")
}
[sub_resource type="CircleShape2D" id="CircleShape2D_c56yc"]
radius = 4.0
[sub_resource type="Animation" id="Animation_uwkl1"]
length = 0.001
tracks/0/type = "value"
@@ -170,14 +166,6 @@ libraries = {
&"": SubResource("AnimationLibrary_62gix")
}
[node name="Top" type="Area2D" parent="."]
script = ExtResource("4_62gix")
metadata/_custom_type_script = "uid://cnheej0sxmoxg"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Top"]
position = Vector2(0, -164)
shape = SubResource("CircleShape2D_c56yc")
[node name="ScoreNoteSpawner" type="Node" parent="."]
script = ExtResource("5_dm4yn")
note_offset = Vector2(0, -160)
@@ -211,5 +199,3 @@ json_file_path = "res://Assets/Sprites/Tilesets/FlagPole.json"
metadata/_custom_type_script = "uid://cqif1li7otvpl"
[connection signal="area_entered" from="Hitbox" to="." method="on_area_entered"]
[connection signal="player_entered" from="Top" to="." method="on_player_entered"]
[connection signal="player_entered" from="Top" to="ScoreNoteSpawner" method="spawn_one_up_note" unbinds=1]