From 94badfb27ae0fa8c817b6b5fa41fc62f3b92bbad Mon Sep 17 00:00:00 2001 From: Jan Schuffenhauer Date: Mon, 20 Apr 2020 19:46:50 +0200 Subject: [PATCH] Added Ruby Sprites and Implemented them --- src/Objects/Rubies/Blue.tscn | 9 ++---- src/Objects/Rubies/Green.tscn | 7 ++--- src/Objects/Rubies/Red.tscn | 9 ++---- src/Objects/Rubies/rubin_black.png | Bin 0 -> 337 bytes src/Objects/Rubies/rubin_black.png.import | 34 +++++++++++++++++++++ src/Objects/Rubies/rubin_blue.png | Bin 0 -> 338 bytes src/Objects/Rubies/rubin_blue.png.import | 34 +++++++++++++++++++++ src/Objects/Rubies/rubin_green.png | Bin 0 -> 338 bytes src/Objects/Rubies/rubin_green.png.import | 34 +++++++++++++++++++++ src/Objects/Rubies/rubin_purple.png | Bin 0 -> 338 bytes src/Objects/Rubies/rubin_purple.png.import | 34 +++++++++++++++++++++ src/Objects/Rubies/rubin_red.png | Bin 0 -> 338 bytes src/Objects/Rubies/rubin_red.png.import | 34 +++++++++++++++++++++ src/Objects/Rubies/rubin_yellow.png | Bin 0 -> 338 bytes src/Objects/Rubies/rubin_yellow.png.import | 34 +++++++++++++++++++++ src/World.tscn | 2 +- 16 files changed, 214 insertions(+), 17 deletions(-) create mode 100644 src/Objects/Rubies/rubin_black.png create mode 100644 src/Objects/Rubies/rubin_black.png.import create mode 100644 src/Objects/Rubies/rubin_blue.png create mode 100644 src/Objects/Rubies/rubin_blue.png.import create mode 100644 src/Objects/Rubies/rubin_green.png create mode 100644 src/Objects/Rubies/rubin_green.png.import create mode 100644 src/Objects/Rubies/rubin_purple.png create mode 100644 src/Objects/Rubies/rubin_purple.png.import create mode 100644 src/Objects/Rubies/rubin_red.png create mode 100644 src/Objects/Rubies/rubin_red.png.import create mode 100644 src/Objects/Rubies/rubin_yellow.png create mode 100644 src/Objects/Rubies/rubin_yellow.png.import 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 0000000000000000000000000000000000000000..178cd2e6125c89058fb96f8eb87b3453da90d4cb GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdMMWT^vI!dY@iC%?t8b zz^Q-Er`>&h7Vs!s-zS{udXKq9?f~n7*49-n73W-@uvtyq*&Ox8#zC`ep2L2&=kAIB xS+{Gy(4N{b^%CRyt&?ix&e`m(+;jAgc-b8$%`%UpkAPM%c)I$ztaD0e0sy?YqvQYp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8b57cf318e6bc1d5cbec52e7f82ee5d27650018 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdGofT^vI!dY@iC%?t8b zz%q^B`C9U(hK)uIF~9wmh*t6oR56G%h>NWfdT1#;QTm0;Grp{ipBa|ksAT#pHAlYn yulSvH3)Y7)g?X{>x#sn$(&F=%XCK8r$E)8^`uS$Z=AA%07(8A5T-G@yGywp0y`tOz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71952e2e278b5ee6e4dbaf475186e69ea450a610 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdGofT^vI!dY@iC%?t8b zK$*tx^IGzzhK)uIF~9wmh*t6oR56G%h>NWfdT1#;QTm0;Grp{ipBa|ksAT#pHAlYn xulSvH3)Y7)g?X{>x#sn$(&F=%XCK8r$JaQ?d8XTmJ_6do;OXk;vd$@?2>@S`prZf) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb8043e0da4baac181c3fc8a1356f8a8c7bf2151 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdGofT^vI!dY@iC%?t8b zfSKlRe@%H)!$zZqnBRU&L@W6Psu;u>#Kl$#J+u^_DE-3a8DG}M&kRd%R5JaQnj_!( xSNzVp1?xkY!o1k`T=V)=Y4Q2XvyWn*>BxpjiL_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2d09fef3e4bc0a9ff17c3b37ae59868b3809595b GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!n?i zYz!Q;;_IgNtUGex^8f$;*QtcQ49Wl0+4f`O^6B=bR};KGE-3hS=g`$6jeE1r-d@Q5 z@pYq8Q?lB@h|m`adwxuDp1Iig#J1vR=a&BZC~ep+UwmA8!=t3TpR(n%Yn0YZ4Sln8 z!7rEa;E1}k{Jo}I?pOeAJTJua7w7=>k|4ie2B4KhfXEgNkdGofT^vI!dY@iC%?t8b zfM4qW-lvPz)B@NhWZ&=HqV%58iT?r9gF{ZCN;c_AMa*+g+;P+`lUpES?Y|(t`Saop y|C?@$ewpfZ!0Tnh^(ap}{`7hGZ0;rfk|4ie2B4KhfXEgNkdGofT^vI!dY@iC%?t8b zfSJZ`e{FeF!$zZqnBRU&L@W6Psu;u>#Kl$#J+u^_DE-3a8DG}M&kRd%R5JaQnj_!( xSNzVp1?xkY!o1k`T=V)=Y4Q2XvyWn*