merge with main

Levels/Interactables/Gem.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://Sprites/Assets/Resources_Basic.png" type="Texture" id=1]
+[ext_resource path="res://Sprites/Assets/resources_basic.png" type="Texture" id=1]
 [ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
 
 [sub_resource type="Animation" id=3]

Levels/Level 4.tscn

@@ -1,18 +1,18 @@
 [gd_scene load_steps=31 format=2]
 
-[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png" type="Texture" id=1]
+[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_12.png" type="Texture" id=1]
 [ext_resource path="res://Enemies/Hellhound.tscn" type="PackedScene" id=2]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_03.png" type="Texture" id=3]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_09.png" type="Texture" id=4]
 [ext_resource path="res://Levels/Objects/Door.tscn" type="PackedScene" id=5]
-[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png" type="Texture" id=6]
+[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_10.png" type="Texture" id=6]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_04.png" type="Texture" id=7]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_06.png" type="Texture" id=8]
 [ext_resource path="res://Levels/Level 4.gd" type="Script" id=9]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_01.png" type="Texture" id=10]
-[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png" type="Texture" id=11]
-[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png" type="Texture" id=12]
-[ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png" type="Texture" id=13]
+[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_13.png" type="Texture" id=11]
+[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_14.png" type="Texture" id=12]
+[ext_resource path="res://Sprites/Levels/Environment/fire_column_medium_11.png" type="Texture" id=13]
 [ext_resource path="res://Sprites/Levels/Environment/Fire_Column_Medium_08.png" type="Texture" id=14]
 [ext_resource path="res://Resources/Level_4_Tileset.tres" type="TileSet" id=15]
 [ext_resource path="res://Levels/Interactables/Treasure Chest.tscn" type="PackedScene" id=16]
@@ -86,21 +86,21 @@ tile_data = PoolIntArray( -2359292, 0, 5, -2359291, 0, 196610, -2359290, 0, 1966
 [node name="Fire3" type="AnimatedSprite" parent="."]
 position = Vector2( -607.628, -210.601 )
 frames = SubResource( 1 )
-frame = 2
+frame = 10
 playing = true
 offset = Vector2( 679.819, 333.222 )
 
 [node name="Fire2" type="AnimatedSprite" parent="."]
 position = Vector2( -543.25, -212.563 )
 frames = SubResource( 1 )
-frame = 5
+frame = 13
 playing = true
 offset = Vector2( 679.819, 333.222 )
 
 [node name="Fire1" type="AnimatedSprite" parent="."]
 position = Vector2( -479.806, -214.167 )
 frames = SubResource( 1 )
-frame = 12
+frame = 6
 playing = true
 offset = Vector2( 679.819, 333.222 )
 
@@ -206,11 +206,12 @@ scale = Vector2( 1.25, 1.25 )
 collision_layer = 2
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="DoorCollision"]
-position = Vector2( 201, -10 )
+position = Vector2( 203, -9 )
 shape = SubResource( 11 )
 
 [node name="NextArea" type="Area2D" parent="."]
 collision_layer = 2
+collision_mask = 2
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="NextArea"]
 position = Vector2( 200, -56 )

Player/Player.gd

@@ -7,8 +7,6 @@ export var FRICTION: int = 1000
 const HEALTH_SLICES: Array = [0, 18, 35, 50, 65, 82, 100]
 var health_index: int = 6
 
-var l5_gems: int = 0
-
 var hud: CanvasLayer = null
 var velocity: Vector2 = Vector2.ZERO
 

Sprites/Assets/resources_basic.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex"
+path="res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Assets/Resources_Basic.png"
-dest_files=[ "res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex" ]
+source_file="res://Sprites/Assets/resources_basic.png"
+dest_files=[ "res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex" ]
 
 [params]
 

Sprites/Levels/Environment/fire_column_medium_10.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex"
+path="res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png"
-dest_files=[ "res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex" ]
+source_file="res://Sprites/Levels/Environment/fire_column_medium_10.png"
+dest_files=[ "res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex" ]
 
 [params]
 

Sprites/Levels/Environment/fire_column_medium_11.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex"
+path="res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_11.png"
-dest_files=[ "res://.import/Fire_Column_Medium_11.png-cb278dde504fd6f8f415eda7091cfa9a.stex" ]
+source_file="res://Sprites/Levels/Environment/fire_column_medium_11.png"
+dest_files=[ "res://.import/fire_column_medium_11.png-f6c2ac8f20428aebca0febd0f65a5806.stex" ]
 
 [params]
 

Sprites/Levels/Environment/fire_column_medium_12.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex"
+path="res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_12.png"
-dest_files=[ "res://.import/Fire_Column_Medium_12.png-1e7c2da6903b243f73d7ed4b50d90f8a.stex" ]
+source_file="res://Sprites/Levels/Environment/fire_column_medium_12.png"
+dest_files=[ "res://.import/fire_column_medium_12.png-25bc0d063fd42a44b6e9e423e3bf2656.stex" ]
 
 [params]
 

Sprites/Levels/Environment/fire_column_medium_13.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex"
+path="res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_13.png"
-dest_files=[ "res://.import/Fire_Column_Medium_13.png-a147b7694df1cdf05d373697c6a4ede3.stex" ]
+source_file="res://Sprites/Levels/Environment/fire_column_medium_13.png"
+dest_files=[ "res://.import/fire_column_medium_13.png-6f8490642f9a7a3884a31ae3975deb08.stex" ]
 
 [params]
 

Sprites/Levels/Environment/fire_column_medium_14.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex"
+path="res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_14.png"
-dest_files=[ "res://.import/Fire_Column_Medium_14.png-205dacf8251c335e3becb65b0df84941.stex" ]
+source_file="res://Sprites/Levels/Environment/fire_column_medium_14.png"
+dest_files=[ "res://.import/fire_column_medium_14.png-81452b14764f0dd97e4008c5f9448c38.stex" ]
 
 [params]