From 245fd0d95c4a6e82c56304ccfd1ac9cc424df67f Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 23 Apr 2020 15:55:06 +0200 Subject: [PATCH 1/3] Added Card Descriptions --- src/Objects/Banana/BananaCard.tscn | 23 +++++++++++++++++------ src/Objects/Barrel/BarrelCard.tscn | 23 +++++++++++++++++------ src/Objects/Barriere/BarrierCard.tscn | 23 +++++++++++++++++------ src/Objects/Slime/SlimeCard.tscn | 23 +++++++++++++++++------ src/Objects/Torch/TorchCard.tscn | 23 +++++++++++++++++------ src/Objects/Traps/Bear/BearCard.tscn | 16 +++++++++++++++- src/Objects/Traps/Flame/FlameCard.tscn | 23 +++++++++++++++++------ src/Objects/Traps/Spike/SpikeCard.tscn | 23 +++++++++++++++++------ 8 files changed, 134 insertions(+), 43 deletions(-) diff --git a/src/Objects/Banana/BananaCard.tscn b/src/Objects/Banana/BananaCard.tscn index 9d23b00..48f67be 100644 --- a/src/Objects/Banana/BananaCard.tscn +++ b/src/Objects/Banana/BananaCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=1] [ext_resource path="res://Objects/Banana/mouse_follow.png" type="Texture" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://Objects/Banana/icon.png" type="Texture" id=6] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=7] [ext_resource path="res://Objects/Banana/Banana.tscn" type="PackedScene" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -16,15 +17,15 @@ animations = [ { "name": "lvl0", "speed": 60.0 }, { -"frames": [ ExtResource( 3 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 -}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl1", "speed": 60.0 +}, { +"frames": [ ExtResource( 3 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 } ] [node name="BananaCard" type="TextureRect"] @@ -50,3 +51,13 @@ texture = ExtResource( 7 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -7.08307 +margin_top = -10.7319 +margin_right = 38.9169 +margin_bottom = 3.26807 +custom_fonts/font = ExtResource( 9 ) +text = "Banana" +align = 1 +valign = 1 diff --git a/src/Objects/Barrel/BarrelCard.tscn b/src/Objects/Barrel/BarrelCard.tscn index 6ccf299..335a819 100644 --- a/src/Objects/Barrel/BarrelCard.tscn +++ b/src/Objects/Barrel/BarrelCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=1] [ext_resource path="res://Objects/Card/level2.png" type="Texture" id=2] @@ -8,19 +8,20 @@ [ext_resource path="res://Objects/Barrel/Barrel.tscn" type="PackedScene" id=6] [ext_resource path="res://Objects/Barrel/fass.png" type="Texture" id=7] [ext_resource path="res://Objects/Barrel/barrel_icon.png" type="Texture" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 3 ) ], -"loop": false, -"name": "lvl1", -"speed": 60.0 -}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl0", "speed": 60.0 }, { +"frames": [ ExtResource( 3 ) ], +"loop": false, +"name": "lvl1", +"speed": 60.0 +}, { "frames": [ ExtResource( 2 ) ], "loop": false, "name": "lvl2", @@ -50,3 +51,13 @@ texture = ExtResource( 5 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -3.4868 +margin_top = -10.8478 +margin_right = 36.5132 +margin_bottom = 3.15219 +custom_fonts/font = ExtResource( 9 ) +text = "Barrel" +align = 1 +valign = 1 diff --git a/src/Objects/Barriere/BarrierCard.tscn b/src/Objects/Barriere/BarrierCard.tscn index 40ad3c7..5fa02ea 100644 --- a/src/Objects/Barriere/BarrierCard.tscn +++ b/src/Objects/Barriere/BarrierCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=1] [ext_resource path="res://Objects/Card/level2.png" type="Texture" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://Objects/Barriere/Barriere.tscn" type="PackedScene" id=6] [ext_resource path="res://Objects/Barriere/wall_icon.png" type="Texture" id=7] [ext_resource path="res://Objects/Barriere/wall_set.png" type="Texture" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -16,15 +17,15 @@ animations = [ { "name": "lvl0", "speed": 60.0 }, { -"frames": [ ExtResource( 2 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 -}, { "frames": [ ExtResource( 3 ) ], "loop": false, "name": "lvl1", "speed": 60.0 +}, { +"frames": [ ExtResource( 2 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 } ] [node name="GenericCard3" type="TextureRect"] @@ -50,3 +51,13 @@ texture = ExtResource( 5 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -3.75516 +margin_top = -12.0165 +margin_right = 36.2448 +margin_bottom = 1.98349 +custom_fonts/font = ExtResource( 9 ) +text = "Wall" +align = 1 +valign = 1 diff --git a/src/Objects/Slime/SlimeCard.tscn b/src/Objects/Slime/SlimeCard.tscn index 3204fea..5a5ec55 100644 --- a/src/Objects/Slime/SlimeCard.tscn +++ b/src/Objects/Slime/SlimeCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=1] [ext_resource path="res://Objects/Card/level2.png" type="Texture" id=2] @@ -8,9 +8,15 @@ [ext_resource path="res://Objects/Slime/Slime.tscn" type="PackedScene" id=6] [ext_resource path="res://Objects/Slime/slime.png" type="Texture" id=7] [ext_resource path="res://Objects/Slime/slime_icon.png" type="Texture" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { +"frames": [ ExtResource( 4 ) ], +"loop": false, +"name": "lvl0", +"speed": 60.0 +}, { "frames": [ ExtResource( 3 ) ], "loop": false, "name": "lvl1", @@ -20,11 +26,6 @@ animations = [ { "loop": false, "name": "lvl2", "speed": 60.0 -}, { -"frames": [ ExtResource( 4 ) ], -"loop": false, -"name": "lvl0", -"speed": 60.0 } ] [node name="SlimeCard" type="TextureRect"] @@ -50,3 +51,13 @@ texture = ExtResource( 5 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -4.29276 +margin_top = -11.5905 +margin_right = 35.7072 +margin_bottom = 2.40953 +custom_fonts/font = ExtResource( 9 ) +text = "Slime" +align = 1 +valign = 1 diff --git a/src/Objects/Torch/TorchCard.tscn b/src/Objects/Torch/TorchCard.tscn index 06a5c2b..5dbc6a7 100644 --- a/src/Objects/Torch/TorchCard.tscn +++ b/src/Objects/Torch/TorchCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Objects/Torch/fakel/fakel_000.png" type="Texture" id=1] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://Objects/Card/level2.png" type="Texture" id=5] [ext_resource path="res://Objects/Card/level1.png" type="Texture" id=6] [ext_resource path="res://Objects/Torch/Torch.tscn" type="PackedScene" id=7] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=8] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -15,15 +16,15 @@ animations = [ { "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 +}, { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 } ] [node name="TorchCard" type="TextureRect"] @@ -49,3 +50,13 @@ texture = ExtResource( 2 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -3.23533 +margin_top = -10.0295 +margin_right = 36.7647 +margin_bottom = 3.97046 +custom_fonts/font = ExtResource( 8 ) +text = "Torch" +align = 1 +valign = 1 diff --git a/src/Objects/Traps/Bear/BearCard.tscn b/src/Objects/Traps/Bear/BearCard.tscn index 83ab17b..c43e188 100644 --- a/src/Objects/Traps/Bear/BearCard.tscn +++ b/src/Objects/Traps/Bear/BearCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=1] [ext_resource path="res://Objects/Traps/Bear/Animation/0012.png" type="Texture" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://Objects/Traps/Bear/bear.jpg" type="Texture" id=6] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=7] [ext_resource path="res://Objects/Traps/Bear/Bear.tscn" type="PackedScene" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -50,3 +51,16 @@ texture = ExtResource( 7 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -5.50008 +margin_top = -10.6766 +margin_right = 37.4999 +margin_bottom = 3.32339 +custom_fonts/font = ExtResource( 9 ) +text = "Beartrap" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/src/Objects/Traps/Flame/FlameCard.tscn b/src/Objects/Traps/Flame/FlameCard.tscn index d78a194..4952d2f 100644 --- a/src/Objects/Traps/Flame/FlameCard.tscn +++ b/src/Objects/Traps/Flame/FlameCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Objects/Traps/Flame/Animation/fire_059.png" type="Texture" id=1] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] @@ -8,14 +8,10 @@ [ext_resource path="res://Objects/Card/level1.png" type="Texture" id=6] [ext_resource path="res://Objects/Traps/Flame/Flame.tscn" type="PackedScene" id=7] [ext_resource path="res://Objects/Traps/Flame/fire_icon.png" type="Texture" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 5 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 -}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl0", @@ -25,6 +21,11 @@ animations = [ { "loop": false, "name": "lvl1", "speed": 60.0 +}, { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 } ] [node name="FlameCard" type="TextureRect"] @@ -50,3 +51,13 @@ texture = ExtResource( 2 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -3.86454 +margin_top = -10.6735 +margin_right = 36.1355 +margin_bottom = 3.32651 +custom_fonts/font = ExtResource( 9 ) +text = "Flames" +align = 1 +valign = 1 diff --git a/src/Objects/Traps/Spike/SpikeCard.tscn b/src/Objects/Traps/Spike/SpikeCard.tscn index eb89e0c..5130256 100644 --- a/src/Objects/Traps/Spike/SpikeCard.tscn +++ b/src/Objects/Traps/Spike/SpikeCard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Objects/Traps/Spike/Animation/spikes_015.png" type="Texture" id=1] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] @@ -8,14 +8,10 @@ [ext_resource path="res://Objects/Card/level1.png" type="Texture" id=6] [ext_resource path="res://Objects/Traps/Spike/Spike.tscn" type="PackedScene" id=7] [ext_resource path="res://Objects/Traps/Spike/spikes_icon.png" type="Texture" id=8] +[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=9] [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 5 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 -}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl0", @@ -25,6 +21,11 @@ animations = [ { "loop": false, "name": "lvl1", "speed": 60.0 +}, { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 } ] [node name="SpikeCard" type="TextureRect"] @@ -50,3 +51,13 @@ texture = ExtResource( 2 ) position = Vector2( 33.1035, 40.3068 ) frames = SubResource( 1 ) animation = "lvl0" + +[node name="Label" type="Label" parent="."] +margin_left = -3.68052 +margin_top = -10.6735 +margin_right = 36.3195 +margin_bottom = 3.32649 +custom_fonts/font = ExtResource( 9 ) +text = "Spikes" +align = 1 +valign = 1 From 7845321dbbfa5fa6be67545508ef6d34b79b74b4 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 23 Apr 2020 17:10:35 +0200 Subject: [PATCH 2/3] Fixed wrong card node names --- src/Objects/Barrel/BarrelCard.tscn | 10 +++++----- src/Objects/Barriere/BarrierCard.tscn | 10 +++++----- src/Objects/Traps/Bear/BearCard.tscn | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Objects/Barrel/BarrelCard.tscn b/src/Objects/Barrel/BarrelCard.tscn index 335a819..656d88c 100644 --- a/src/Objects/Barrel/BarrelCard.tscn +++ b/src/Objects/Barrel/BarrelCard.tscn @@ -12,9 +12,9 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 2 ) ], "loop": false, -"name": "lvl0", +"name": "lvl2", "speed": 60.0 }, { "frames": [ ExtResource( 3 ) ], @@ -22,13 +22,13 @@ animations = [ { "name": "lvl1", "speed": 60.0 }, { -"frames": [ ExtResource( 2 ) ], +"frames": [ ExtResource( 4 ) ], "loop": false, -"name": "lvl2", +"name": "lvl0", "speed": 60.0 } ] -[node name="GenericCard4" type="TextureRect"] +[node name="BarrelCard" type="TextureRect"] margin_left = 180.718 margin_top = 220.859 margin_right = 212.718 diff --git a/src/Objects/Barriere/BarrierCard.tscn b/src/Objects/Barriere/BarrierCard.tscn index 5fa02ea..a047cd6 100644 --- a/src/Objects/Barriere/BarrierCard.tscn +++ b/src/Objects/Barriere/BarrierCard.tscn @@ -12,9 +12,9 @@ [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 2 ) ], "loop": false, -"name": "lvl0", +"name": "lvl2", "speed": 60.0 }, { "frames": [ ExtResource( 3 ) ], @@ -22,13 +22,13 @@ animations = [ { "name": "lvl1", "speed": 60.0 }, { -"frames": [ ExtResource( 2 ) ], +"frames": [ ExtResource( 4 ) ], "loop": false, -"name": "lvl2", +"name": "lvl0", "speed": 60.0 } ] -[node name="GenericCard3" type="TextureRect"] +[node name="BarrierCard" type="TextureRect"] margin_left = 124.812 margin_top = 220.859 margin_right = 156.812 diff --git a/src/Objects/Traps/Bear/BearCard.tscn b/src/Objects/Traps/Bear/BearCard.tscn index c43e188..5143064 100644 --- a/src/Objects/Traps/Bear/BearCard.tscn +++ b/src/Objects/Traps/Bear/BearCard.tscn @@ -28,7 +28,7 @@ animations = [ { "speed": 60.0 } ] -[node name="GenericCard2" type="TextureRect"] +[node name="BearTrapCard" type="TextureRect"] margin_left = 69.0145 margin_top = 221.191 margin_right = 101.014 From b99cce2e9b122ea37b68dbf471e94b5243a1fd7f Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 23 Apr 2020 17:29:15 +0200 Subject: [PATCH 3/3] Renamed torch to spawner to be more descriptive --- src/Objects/Torch/TorchCard.tscn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Objects/Torch/TorchCard.tscn b/src/Objects/Torch/TorchCard.tscn index 5dbc6a7..2f5297f 100644 --- a/src/Objects/Torch/TorchCard.tscn +++ b/src/Objects/Torch/TorchCard.tscn @@ -16,15 +16,15 @@ animations = [ { "name": "lvl0", "speed": 60.0 }, { -"frames": [ ExtResource( 6 ) ], -"loop": false, -"name": "lvl1", -"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="TorchCard" type="TextureRect"] @@ -57,6 +57,6 @@ margin_top = -10.0295 margin_right = 36.7647 margin_bottom = 3.97046 custom_fonts/font = ExtResource( 8 ) -text = "Torch" +text = "Spawner" align = 1 valign = 1