From 0b930fd1c6b5e494ed6cf8c3b0705cb7617c7925 Mon Sep 17 00:00:00 2001 From: Conrad Date: Mon, 20 Apr 2020 12:37:12 +0200 Subject: [PATCH] Added Level Indicators to Cards --- src/Menus/DragNDrop/DragSource.gd | 15 +++++++----- src/Menus/DragNDrop/DragSource.tscn | 30 ++++++++++++++++++++++-- src/Objects/Card/level0.png | Bin 0 -> 137 bytes src/Objects/Card/level0.png.import | 34 ++++++++++++++++++++++++++++ src/Objects/Card/level1.png | Bin 0 -> 142 bytes src/Objects/Card/level1.png.import | 34 ++++++++++++++++++++++++++++ src/Objects/Card/level2.png | Bin 0 -> 123 bytes src/Objects/Card/level2.png.import | 34 ++++++++++++++++++++++++++++ 8 files changed, 139 insertions(+), 8 deletions(-) create mode 100644 src/Objects/Card/level0.png create mode 100644 src/Objects/Card/level0.png.import create mode 100644 src/Objects/Card/level1.png create mode 100644 src/Objects/Card/level1.png.import create mode 100644 src/Objects/Card/level2.png create mode 100644 src/Objects/Card/level2.png.import diff --git a/src/Menus/DragNDrop/DragSource.gd b/src/Menus/DragNDrop/DragSource.gd index 82615e1..a01508f 100644 --- a/src/Menus/DragNDrop/DragSource.gd +++ b/src/Menus/DragNDrop/DragSource.gd @@ -1,5 +1,5 @@ extends TextureRect -#CardDeck +# CardDeck export var Item:PackedScene export var PreviewIcon:Texture export var DeleteOnGrab:bool = false @@ -8,28 +8,31 @@ export var DeleteOnGrab:bool = false func get_drag_data(_pos): var ctrl = Control.new() var TR = TextureRect.new() - TR.texture = get_resized_texture(PreviewIcon,self.rect_size[0],self.rect_size[1]) - TR.rect_size= self.rect_size - TR.set_position(_pos*-1,false) + TR.texture = get_resized_texture(PreviewIcon, self.rect_size[0], self.rect_size[1]) + TR.rect_size = self.rect_size + TR.set_position(_pos * -1, false) ctrl.add_child(TR) set_drag_preview(ctrl) - if DeleteOnGrab : + if DeleteOnGrab: self.queue_free() return Item + #stuff can be dropped here #eg you picked the wrong thing up, let go and it returns to nothingness func can_drop_data(_pos, data): return typeof(data) == typeof(PackedScene) + #do nothing if stuff is dropped here func drop_data(_pos, _data): pass + func get_resized_texture(t: Texture, width: int = 0, height: int = 0): var image = t.get_data() - if width > 0 && height > 0: + if width > 0 and height > 0: image.resize(width, height) var itex = ImageTexture.new() itex.create_from_image(image,0) diff --git a/src/Menus/DragNDrop/DragSource.tscn b/src/Menus/DragNDrop/DragSource.tscn index 6070ea3..505e0ee 100644 --- a/src/Menus/DragNDrop/DragSource.tscn +++ b/src/Menus/DragNDrop/DragSource.tscn @@ -1,8 +1,29 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://icon.png" type="Texture" id=1] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=3] +[ext_resource path="res://Objects/Card/level0.png" type="Texture" id=4] +[ext_resource path="res://Objects/Card/level2.png" type="Texture" id=5] +[ext_resource path="res://Objects/Card/level1.png" type="Texture" id=6] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 4 ) ], +"loop": false, +"name": "lvl0", +"speed": 60.0 +}, { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 +}, { +"frames": [ ExtResource( 6 ) ], +"loop": false, +"name": "lvl1", +"speed": 60.0 +} ] [node name="DragSource" type="TextureRect"] margin_left = 10.7364 @@ -17,6 +38,11 @@ __meta__ = { } [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 16.0791, 16.0117 ) +position = Vector2( 15.729, 15.7929 ) z_index = -1 texture = ExtResource( 2 ) + +[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( 33.1035, 40.3068 ) +frames = SubResource( 1 ) +animation = "lvl0" diff --git a/src/Objects/Card/level0.png b/src/Objects/Card/level0.png new file mode 100644 index 0000000000000000000000000000000000000000..58395a20fd6f46f40eb19785c11bfb2c78bce600 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^96-#>$P6T>u-)MXQjEnx?oNz1PwLbIIh+L^k;M!Q z+`=Ht$S`Y;1W=GIz$e7@|Ns9$X6T{IbwG-#B*-uLKf}}Q23|lOpQnpsNX4AwganV| a1fYQy4C&wZTvY(dFnGH9xvX#0(@aFI#pSNHG=%xjQl5JgHL;vL>4nJ za0`PlBg3pY5+K0g6NM literal 0 HcmV?d00001 diff --git a/src/Objects/Card/level1.png.import b/src/Objects/Card/level1.png.import new file mode 100644 index 0000000..4088ced --- /dev/null +++ b/src/Objects/Card/level1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/level1.png-ab0efb90911fd7134ef5c5c3c34ffe82.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Card/level1.png" +dest_files=[ "res://.import/level1.png-ab0efb90911fd7134ef5c5c3c34ffe82.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/Card/level2.png b/src/Objects/Card/level2.png new file mode 100644 index 0000000000000000000000000000000000000000..2d42d0691b97031ee06a05cc188409ab52ab87f5 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^96-#>$P6T>u-)MXQjEnx?oNz1PwLbIIh+L^k;M!Q z+`=Ht$S`Y;1W=GIz$e7@|NsB%R6=vkK0gT*;q!EH45^rtoRHv=oB%Y!f+79;o~sH# O83s>RKbLh*2~7Y1mmU`Y literal 0 HcmV?d00001 diff --git a/src/Objects/Card/level2.png.import b/src/Objects/Card/level2.png.import new file mode 100644 index 0000000..c080379 --- /dev/null +++ b/src/Objects/Card/level2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/level2.png-377010b68cc608f506f01e4ccb424729.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Card/level2.png" +dest_files=[ "res://.import/level2.png-377010b68cc608f506f01e4ccb424729.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