diff --git a/src/Objects/Rubies/Blue.tscn b/src/Objects/Rubies/Blue.tscn index 2826e60..f8541b9 100644 --- a/src/Objects/Rubies/Blue.tscn +++ b/src/Objects/Rubies/Blue.tscn @@ -2,12 +2,12 @@ [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] -[ext_resource path="res://testSprites/blue_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Objects/Rubies/rubin_blue.png" type="Texture" id=3] [ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] -radius = 7.43707 -height = 2.89399 +radius = 9.5 +height = 1.0 [node name="Blue" type="Node2D"] script = ExtResource( 2 ) @@ -21,14 +21,11 @@ position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) [node name="Hurtbox" parent="." instance=ExtResource( 1 )] -position = Vector2( 1.54256, -4.73786 ) collision_layer = 32 collision_mask = 0 currency_value = 5 [node name="CollisionShape2D" parent="Hurtbox" index="0"] -position = Vector2( -1.54256, 4.73785 ) -rotation = 1.5708 shape = SubResource( 1 ) [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] diff --git a/src/Objects/Rubies/Green.tscn b/src/Objects/Rubies/Green.tscn index b0a81d1..acd2ead 100644 --- a/src/Objects/Rubies/Green.tscn +++ b/src/Objects/Rubies/Green.tscn @@ -2,12 +2,12 @@ [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] -[ext_resource path="res://testSprites/green_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Objects/Rubies/rubin_green.png" type="Texture" id=3] [ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] -radius = 7.43707 -height = 2.89399 +radius = 9.5 +height = 1.0 [node name="Green" type="Node2D"] script = ExtResource( 2 ) @@ -28,7 +28,6 @@ currency_value = 1 [node name="CollisionShape2D" parent="Hurtbox" index="0"] position = Vector2( -1.54256, 4.73785 ) -rotation = 1.5708 shape = SubResource( 1 ) [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] diff --git a/src/Objects/Rubies/Red.tscn b/src/Objects/Rubies/Red.tscn index bc3bd2f..019483d 100644 --- a/src/Objects/Rubies/Red.tscn +++ b/src/Objects/Rubies/Red.tscn @@ -2,12 +2,12 @@ [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] -[ext_resource path="res://testSprites/red_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Objects/Rubies/rubin_red.png" type="Texture" id=3] [ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] -radius = 7.43707 -height = 2.89399 +radius = 9.5 +height = 1.0 [node name="Red" type="Node2D"] script = ExtResource( 2 ) @@ -21,14 +21,11 @@ position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) [node name="Hurtbox" parent="." instance=ExtResource( 1 )] -position = Vector2( 1.54256, -4.73786 ) collision_layer = 32 collision_mask = 0 currency_value = 20 [node name="CollisionShape2D" parent="Hurtbox" index="0"] -position = Vector2( -1.54256, 4.73785 ) -rotation = 1.5708 shape = SubResource( 1 ) [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] diff --git a/src/Objects/Rubies/rubin_black.png b/src/Objects/Rubies/rubin_black.png new file mode 100644 index 0000000..178cd2e Binary files /dev/null and b/src/Objects/Rubies/rubin_black.png differ diff --git a/src/Objects/Rubies/rubin_black.png.import b/src/Objects/Rubies/rubin_black.png.import new file mode 100644 index 0000000..c984aff --- /dev/null +++ b/src/Objects/Rubies/rubin_black.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_black.png-4a104525d1c8b26b7af7f6534bb48691.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_black.png" +dest_files=[ "res://.import/rubin_black.png-4a104525d1c8b26b7af7f6534bb48691.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Rubies/rubin_blue.png b/src/Objects/Rubies/rubin_blue.png new file mode 100644 index 0000000..c8b57cf Binary files /dev/null and b/src/Objects/Rubies/rubin_blue.png differ diff --git a/src/Objects/Rubies/rubin_blue.png.import b/src/Objects/Rubies/rubin_blue.png.import new file mode 100644 index 0000000..a43ad76 --- /dev/null +++ b/src/Objects/Rubies/rubin_blue.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_blue.png-a1a5153396dc0c120ec6511bb27f9656.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_blue.png" +dest_files=[ "res://.import/rubin_blue.png-a1a5153396dc0c120ec6511bb27f9656.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Rubies/rubin_green.png b/src/Objects/Rubies/rubin_green.png new file mode 100644 index 0000000..71952e2 Binary files /dev/null and b/src/Objects/Rubies/rubin_green.png differ diff --git a/src/Objects/Rubies/rubin_green.png.import b/src/Objects/Rubies/rubin_green.png.import new file mode 100644 index 0000000..2a0a5ee --- /dev/null +++ b/src/Objects/Rubies/rubin_green.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_green.png-f0c94b446f6df48cbdcdf44c86d3ee59.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_green.png" +dest_files=[ "res://.import/rubin_green.png-f0c94b446f6df48cbdcdf44c86d3ee59.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Rubies/rubin_purple.png b/src/Objects/Rubies/rubin_purple.png new file mode 100644 index 0000000..eb8043e Binary files /dev/null and b/src/Objects/Rubies/rubin_purple.png differ diff --git a/src/Objects/Rubies/rubin_purple.png.import b/src/Objects/Rubies/rubin_purple.png.import new file mode 100644 index 0000000..c1527ad --- /dev/null +++ b/src/Objects/Rubies/rubin_purple.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_purple.png-d504f083526fa77540d42b04f0860ab6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_purple.png" +dest_files=[ "res://.import/rubin_purple.png-d504f083526fa77540d42b04f0860ab6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Rubies/rubin_red.png b/src/Objects/Rubies/rubin_red.png new file mode 100644 index 0000000..2d09fef Binary files /dev/null and b/src/Objects/Rubies/rubin_red.png differ diff --git a/src/Objects/Rubies/rubin_red.png.import b/src/Objects/Rubies/rubin_red.png.import new file mode 100644 index 0000000..89cccec --- /dev/null +++ b/src/Objects/Rubies/rubin_red.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_red.png-fa7ead74811718fe61af5e3a265c19be.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_red.png" +dest_files=[ "res://.import/rubin_red.png-fa7ead74811718fe61af5e3a265c19be.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/Objects/Rubies/rubin_yellow.png b/src/Objects/Rubies/rubin_yellow.png new file mode 100644 index 0000000..dcfd647 Binary files /dev/null and b/src/Objects/Rubies/rubin_yellow.png differ diff --git a/src/Objects/Rubies/rubin_yellow.png.import b/src/Objects/Rubies/rubin_yellow.png.import new file mode 100644 index 0000000..018ef1b --- /dev/null +++ b/src/Objects/Rubies/rubin_yellow.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/rubin_yellow.png-5f4273b123207e43847e9317510f73da.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Rubies/rubin_yellow.png" +dest_files=[ "res://.import/rubin_yellow.png-5f4273b123207e43847e9317510f73da.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/World.tscn b/src/World.tscn index 3325d9c..2942171 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -23,7 +23,7 @@ HeroTemplate = ExtResource( 1 ) [node name="Background" parent="." instance=ExtResource( 7 )] pause_mode = 1 -frame = 8 +frame = 58 [node name="FloorTileMap" type="TileMap" parent="."] pause_mode = 1