diff --git a/convertors/copper_to_silver.gd b/convertors/copper_to_silver.gd index 8d07388..6a4189d 100644 --- a/convertors/copper_to_silver.gd +++ b/convertors/copper_to_silver.gd @@ -7,11 +7,6 @@ func _on_collector_collected(body): func _on_collector_goal(): - print("silver coin") - var scene_instant = scene.instantiate() - print(position) - print(scene_instant.position) - scene_instant.set_position(position) - print(scene_instant.position) - add_child(scene_instant) - #emit_signal("spawned", scene_instant) + print("silver") + $Spawner.spawn() + diff --git a/convertors/copper_to_silver.tscn b/convertors/copper_to_silver.tscn index b490830..26f54ed 100644 --- a/convertors/copper_to_silver.tscn +++ b/convertors/copper_to_silver.tscn @@ -1,13 +1,23 @@ -[gd_scene load_steps=6 format=3 uid="uid://ratkps4plkhl"] +[gd_scene load_steps=10 format=3 uid="uid://ratkps4plkhl"] [ext_resource type="Script" path="res://convertors/copper_to_silver.gd" id="1_jjv83"] [ext_resource type="PackedScene" uid="uid://dme22vvfgme5f" path="res://entity/coin_silver.tscn" id="2_orv64"] [ext_resource type="Texture2D" uid="uid://b0uefih0ccwp3" path="res://entity/copper_converter_front_1.png" id="2_vm6by"] [ext_resource type="PackedScene" uid="uid://c5w3b55aiui6c" path="res://collector/collector.tscn" id="3_a4naa"] +[ext_resource type="PackedScene" uid="uid://c67lfbk4gf1ga" path="res://spawner/spawner.tscn" id="5_1n0vw"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_k11if"] size = Vector2(26, 5) +[sub_resource type="RectangleShape2D" id="RectangleShape2D_3i6q7"] +size = Vector2(3, 29) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_eqmlo"] +size = Vector2(3, 28) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_31dtl"] +size = Vector2(25.8333, 5) + [node name="CopperToSilver" type="StaticBody2D"] scale = Vector2(3, 3) script = ExtResource("1_jjv83") @@ -20,14 +30,29 @@ texture = ExtResource("2_vm6by") [node name="Collector" parent="." instance=ExtResource("3_a4naa")] collecting_types = Array[StringName]([&"Copper"]) collecting_collision_mask = 4 -collecting_amount = 1 +collecting_amount = 10 [node name="CollisionShape2D" type="CollisionShape2D" parent="Collector"] position = Vector2(0, 9.5) shape = SubResource("RectangleShape2D_k11if") -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array(-16, -15.5, -13, -15.5, -13, 12, 13, 12, 13, -15.5, 16, -15.5, 16, 14.5, -16, 14.5) +[node name="Spawner" parent="." instance=ExtResource("5_1n0vw")] +position = Vector2(-0.333333, 19.3333) +scene = ExtResource("2_orv64") +buffer_cap = 1 +spawn_rotation_range = 90.0 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2(-14.3333, -1) +shape = SubResource("RectangleShape2D_3i6q7") + +[node name="CollisionShape2D2" type="CollisionShape2D" parent="."] +position = Vector2(14.5, -1.66667) +shape = SubResource("RectangleShape2D_eqmlo") + +[node name="CollisionShape2D3" type="CollisionShape2D" parent="."] +position = Vector2(0, 12.3333) +shape = SubResource("RectangleShape2D_31dtl") [connection signal="collected" from="Collector" to="." method="_on_collector_collected"] [connection signal="goal" from="Collector" to="." method="_on_collector_goal"] diff --git a/entity/diamond.png.import b/entity/diamond.png.import new file mode 100644 index 0000000..56ce840 --- /dev/null +++ b/entity/diamond.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bquk2q5g6bst5" +path="res://.godot/imported/diamond.png-e255ab09d23a24a6563c34236c6422d4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/diamond.png" +dest_files=["res://.godot/imported/diamond.png-e255ab09d23a24a6563c34236c6422d4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entity/gemstone.png.import b/entity/gemstone.png.import new file mode 100644 index 0000000..54c98b2 --- /dev/null +++ b/entity/gemstone.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b21bsbo5f0ed7" +path="res://.godot/imported/gemstone.png-9e77a54275f3114b69765356c5f68288.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/gemstone.png" +dest_files=["res://.godot/imported/gemstone.png-9e77a54275f3114b69765356c5f68288.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entity/upgrade_copper.png.import b/entity/upgrade_copper.png.import new file mode 100644 index 0000000..a785e3b --- /dev/null +++ b/entity/upgrade_copper.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8pvjgtr2ufjl" +path="res://.godot/imported/upgrade_copper.png-92818496e71584b34e672f67618f806c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/upgrade_copper.png" +dest_files=["res://.godot/imported/upgrade_copper.png-92818496e71584b34e672f67618f806c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entity/upgrade_gold.png.import b/entity/upgrade_gold.png.import new file mode 100644 index 0000000..1cb0962 --- /dev/null +++ b/entity/upgrade_gold.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://taojrwr7xrp4" +path="res://.godot/imported/upgrade_gold.png-a48bc75df5dc8202543af64ada12eda4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/upgrade_gold.png" +dest_files=["res://.godot/imported/upgrade_gold.png-a48bc75df5dc8202543af64ada12eda4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entity/upgrade_silver.png.import b/entity/upgrade_silver.png.import new file mode 100644 index 0000000..33c1ebb --- /dev/null +++ b/entity/upgrade_silver.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7b12rwclhrq0" +path="res://.godot/imported/upgrade_silver.png-50b5b05efdbda1c035ad16dd8135bc03.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entity/upgrade_silver.png" +dest_files=["res://.godot/imported/upgrade_silver.png-50b5b05efdbda1c035ad16dd8135bc03.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/game/game.gd b/game/game.gd index 33de062..e2e8253 100644 --- a/game/game.gd +++ b/game/game.gd @@ -7,4 +7,3 @@ class_name Game func trigger_spawn(): button_spawner.spawn() - diff --git a/interface/purchasable_item.tscn b/interface/purchasable_item.tscn index ec2ab45..8e9b56b 100644 --- a/interface/purchasable_item.tscn +++ b/interface/purchasable_item.tscn @@ -5,7 +5,7 @@ [ext_resource type="Theme" uid="uid://ba5utvfhnxa5i" path="res://interface/interface_theme.tres" id="1_r2qbu"] [node name="PurchasableItem" type="Panel"] -custom_minimum_size = Vector2(0, 256) +custom_minimum_size = Vector2(0, 240) anchors_preset = 10 anchor_right = 1.0 grow_horizontal = 2 diff --git a/interface/shop_ui.tscn b/interface/shop_ui.tscn index 5d3641f..8990401 100644 --- a/interface/shop_ui.tscn +++ b/interface/shop_ui.tscn @@ -55,25 +55,36 @@ size_flags_horizontal = 8 text = "Back" alignment = 2 -[node name="Scrollable" type="ScrollContainer" parent="Rows"] -clip_contents = false +[node name="PaddedScrollable" type="HBoxContainer" parent="Rows"] layout_mode = 2 size_flags_vertical = 3 + +[node name="PaddedScrollableLeft" type="Control" parent="Rows/PaddedScrollable"] +custom_minimum_size = Vector2(8, 0) +layout_mode = 2 +size_flags_horizontal = 0 + +[node name="Scrollable" type="ScrollContainer" parent="Rows/PaddedScrollable"] +clip_contents = false +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +scroll_vertical = 100 horizontal_scroll_mode = 0 vertical_scroll_mode = 2 -[node name="ScrollableItems" type="VBoxContainer" parent="Rows/Scrollable"] +[node name="ScrollableItems" type="VBoxContainer" parent="Rows/PaddedScrollable/Scrollable"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -[node name="ConvertCategory" type="VBoxContainer" parent="Rows/Scrollable/ScrollableItems"] +[node name="ConvertCategory" type="VBoxContainer" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems"] layout_mode = 2 -[node name="PurchasableItemPadding5" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding5" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="ImproveYourItemsLabel" type="Label" parent="Rows/Scrollable/ScrollableItems/ConvertCategory"] +[node name="ImproveYourItemsLabel" type="Label" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory"] layout_mode = 2 theme_override_font_sizes/font_size = 24 text = "Improve your items!" @@ -82,10 +93,10 @@ vertical_alignment = 1 autowrap_mode = 2 uppercase = true -[node name="PurchasableItemPadding3" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding3" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuySilverifier" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] +[node name="BuySilverifier" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_icon = ExtResource("5_lu2tr") item_name = "Silverifier" @@ -94,56 +105,56 @@ item_cost_text = "35 copper" item_cost_type = &"Copper" item_cost_goal = 35 -[node name="PurchasableItemPadding" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyGoldenser" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyGoldenser" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Goldenser" item_description = "Trades in ten silver coins for a sparkly gold coin!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding2" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding2" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyGemificator" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyGemificator" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Gemificator" item_description = "Converts ten gold coins into a randomly colored gem!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding4" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding4" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyCompressor" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyCompressor" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Compressor" item_description = "Consumes ten gold coins to create either a precious white diamond or an useless lump of coal!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding6" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding6" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyArtifactomatic" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyArtifactomatic" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Artifactic" item_description = "Assembles an artifact from twenty-five gold coins and a gem or a diamond!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding7" parent="Rows/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding7" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ConvertCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="ManualCategory" type="VBoxContainer" parent="Rows/Scrollable/ScrollableItems"] +[node name="ManualCategory" type="VBoxContainer" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems"] layout_mode = 2 -[node name="PurchasableItemPadding5" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding5" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="EarnCoinsLabel" type="Label" parent="Rows/Scrollable/ScrollableItems/ManualCategory"] +[node name="EarnCoinsLabel" type="Label" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory"] layout_mode = 2 theme_override_font_sizes/font_size = 24 text = "Get rich quick!" @@ -152,76 +163,76 @@ vertical_alignment = 1 autowrap_mode = 2 uppercase = true -[node name="PurchasableItemPadding3" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding3" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyAutoCopper" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyAutoCopper" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Auto-copper" item_description = "Receive two copper coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyHeliCopper" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyHeliCopper" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Heli-copper" item_description = "Receive eight copper coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding2" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding2" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyAutoSilver" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyAutoSilver" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Auto-silver" item_description = "Receive two silver coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding4" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding4" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuySuperSilver" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuySuperSilver" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Super silver" item_description = "Receive eight silver coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding6" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding6" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyAutoGold" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyAutoGold" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Auto-gold" item_description = "Receive two gold coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding7" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding7" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyMidasTouch" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyMidasTouch" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Midas Touch" item_description = "Receive eight gold coins per second!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding8" parent="Rows/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding8" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/ManualCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="AutomaticCategory" type="VBoxContainer" parent="Rows/Scrollable/ScrollableItems"] +[node name="AutomaticCategory" type="VBoxContainer" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems"] layout_mode = 2 -[node name="PurchasableItemPadding5" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding5" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="EarnCoinsLabel" type="Label" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory"] +[node name="EarnCoinsLabel" type="Label" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory"] layout_mode = 2 theme_override_font_sizes/font_size = 24 text = "Automatic coin dropper" @@ -230,29 +241,34 @@ vertical_alignment = 1 autowrap_mode = 2 uppercase = true -[node name="PurchasableItemPadding3" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding3" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuySilverStar" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("2_2dtc0")] +[node name="BuySilverStar" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Silver star" item_description = "Create a silver coin when tapping!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 -[node name="BuyGoldStar" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("2_2dtc0")] +[node name="BuyGoldStar" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("2_2dtc0")] layout_mode = 2 item_name = "Gold star" item_description = "Create a gold coin when tapping!" item_cost_text = "??" has_unlocked = false -[node name="PurchasableItemPadding2" parent="Rows/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] +[node name="PurchasableItemPadding2" parent="Rows/PaddedScrollable/Scrollable/ScrollableItems/AutomaticCategory" instance=ExtResource("3_4feaj")] layout_mode = 2 +[node name="PaddedScrollableRight" type="Control" parent="Rows/PaddedScrollable"] +custom_minimum_size = Vector2(8, 0) +layout_mode = 2 +size_flags_horizontal = 8 + [connection signal="pressed" from="Rows/UpperButtons/ScoreButton" to="." method="_on_score_button_pressed"] [connection signal="pressed" from="Rows/UpperButtons/DeleteButton" to="." method="_on_delete_button_pressed"] [connection signal="pressed" from="Rows/UpperButtons/BackButton" to="." method="_on_back_button_pressed"] diff --git a/spawner/spawner.gd b/spawner/spawner.gd index 8e6a5f1..ca416ce 100644 --- a/spawner/spawner.gd +++ b/spawner/spawner.gd @@ -53,3 +53,5 @@ func _do_spawn(): func _physics_process(_delta): if buffer > 0: _do_spawn() + +