daniel/Embodiment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed debugger errors in many files and optimized some scenes/code

Browse Source
This commit is contained in:
VoidTwo
2021-12-12 23:55:59 -06:00
parent fc6dfdef4d
commit ef5ce684eb
39 changed files with 657 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Levels/Level 2.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=2]
[gd_scene load_steps=91 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Levels/Level 2.gd" type="Script" id=2]
@@ -8,10 +8,10 @@
[ext_resource path="res://Levels/Objects/Chest.tscn" type="PackedScene" id=6]
[ext_resource path="res://Sprites/Assets/cliffTileset.png" type="Texture" id=7]
[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=8]
[ext_resource path="res://Enemies/Ghost_Enemy.tscn" type="PackedScene" id=9]
[ext_resource path="res://Enemies/Ghost Enemy.tscn" type="PackedScene" id=9]
[ext_resource path="res://Sprites/Assets/DeadTree.png" type="Texture" id=10]
[ext_resource path="res://Sprites/Assets/darkForestTileset.png" type="Texture" id=11]
[ext_resource path="res://Levels/Area2D.gd" type="Script" id=12]
[ext_resource path="res://Levels/Chest Detection.gd" type="Script" id=12]
[ext_resource path="res://Levels/Camera2D.gd" type="Script" id=13]
[ext_resource path="res://Sprites/Assets/Shadow.png" type="Texture" id=14]
[ext_resource path="res://Levels/Traps/Spawn Trap.tscn" type="PackedScene" id=15]
@@ -21,6 +21,7 @@
[ext_resource path="res://Levels/Objects/Dialogue.tscn" type="PackedScene" id=19]
[ext_resource path="res://Music/Level_2_2.mp3" type="AudioStream" id=20]
[ext_resource path="res://Music/Level_2_1.mp3" type="AudioStream" id=21]
[ext_resource path="res://Levels/Portal Dark Forest.gd" type="Script" id=22]
[sub_resource type="TileSet" id=1]
0/name = "darkForestTileset.png 0"
@@ -797,11 +798,6 @@ radius = 22.8792
[node name="World" type="Node2D"]
script = ExtResource( 2 )
[node name="HUD" parent="." instance=ExtResource( 8 )]
[node name="Control" parent="HUD" instance=ExtResource( 19 )]
visible = false
[node name="YSort" type="YSort" parent="."]
[node name="Player" parent="YSort" instance=ExtResource( 1 )]
@@ -897,32 +893,31 @@ position = Vector2( 350, 0 )
scale = Vector2( 0.5, 0.5 )
z_index = 4
[node name="Area2D" type="Area2D" parent="Collectible"]
[node name="Journal Page" type="Area2D" parent="Collectible"]
collision_layer = 3
collision_mask = 3
[node name="Sprite2" type="Sprite" parent="Collectible/Area2D"]
[node name="Sprite" type="Sprite" parent="Collectible/Journal Page"]
texture = ExtResource( 18 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Collectible/Area2D"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Collectible/Journal Page"]
shape = SubResource( 68 )
[node name="Pause Screen" parent="." instance=ExtResource( 5 )]
[node name="TreasureChest" parent="." instance=ExtResource( 6 )]
position = Vector2( 54, 170 )
scale = Vector2( 0.5, 0.5 )
object_scene = ExtResource( 6 )
[node name="ChestDetection" type="Area2D" parent="TreasureChest"]
[node name="Chest Detection" type="Area2D" parent="TreasureChest"]
script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/ChestDetection"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/Chest Detection"]
position = Vector2( -1.78381, -1.75043 )
scale = Vector2( 3.08, 1.96 )
shape = SubResource( 65 )
[node name="PortalDarkForest" type="Area2D" parent="TreasureChest"]
script = ExtResource( 22 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="TreasureChest/PortalDarkForest"]
position = Vector2( 402.642, -712.75 )
@@ -934,6 +929,7 @@ shape = SubResource( 66 )
[node name="Spawn Trap" parent="Traps" instance=ExtResource( 15 )]
position = Vector2( 296.416, -364.541 )
enemy_path = "res://Enemies/Ghost Enemy.tscn"
[node name="Skull" type="TileMap" parent="."]
modulate = Color( 0.658824, 0.658824, 0.658824, 1 )
@@ -942,6 +938,13 @@ tile_set = SubResource( 67 )
format = 1
tile_data = PoolIntArray( -589828, 0, 0, -458754, 0, 0, -393220, 0, 0 )
[node name="HUD" parent="." instance=ExtResource( 8 )]
[node name="Journal Page Dialogue" parent="HUD" instance=ExtResource( 19 )]
visible = false
[node name="Pause Screen" parent="." instance=ExtResource( 5 )]
[node name="BGM1" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 21 )
volume_db = -10.0
@@ -952,6 +955,6 @@ stream = ExtResource( 20 )
volume_db = -10.0
[connection signal="enter_portal" from="YSort/Player/Camera2D" to="." method="_on_Camera2D_enter_portal"]
[connection signal="body_entered" from="Collectible/Area2D" to="." method="_on_Area2D_body_entered"]
[connection signal="body_entered" from="TreasureChest/ChestDetection" to="TreasureChest/ChestDetection" method="_on_ChestDetection_body_entered"]
[connection signal="body_entered" from="Collectible/Journal Page" to="." method="_on_journal_page_body_entered"]
[connection signal="body_entered" from="TreasureChest/Chest Detection" to="TreasureChest/Chest Detection" method="_on_chest_detection_body_entered"]
[connection signal="body_entered" from="TreasureChest/PortalDarkForest" to="YSort/Player/Camera2D" method="_on_PortalDarkForest_body_entered"]