Lotta backend building, just need to make the art and make the final piece with it.
Effectively broke Strawberry Cupcakes somehow. Not sure tho
main
OnlyMares 2 years ago
parent 41f86f674b
commit 7b9b9d54fb

@ -14,15 +14,15 @@ dock_split_1=0
dock_split_4=0 dock_split_4=0
dock_2="FileSystem" dock_2="FileSystem"
dock_3="Scene,Import" dock_3="Scene,Import"
dock_5="Inspector,Node,History,Commit (33)" dock_5="Inspector,Node,History,Commit (16)"
[EditorNode] [EditorNode]
open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/Cupcakes/strawCupcake.tscn"] open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn"]
[ScriptEditor] [ScriptEditor]
open_scripts=["res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"] open_scripts=["res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://README.md", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"]
open_help=["Node"] open_help=["Node"]
script_split_offset=70 script_split_offset=70
list_split_offset=0 list_split_offset=0

@ -1,5 +1,5 @@
2a60927148abd1d33b818b535e306557 2a60927148abd1d33b818b535e306557
::res://::1678098956 ::res://::1678400171
export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>:: export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>::
README.md::TextFile::-1::1677829846::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>::
::res://addons/::1677750379 ::res://addons/::1677750379
@ -13,7 +13,7 @@ THIRDPARTY.md::TextFile::-1::1677750379::0::1::::<><>::
::res://Art/::1677787260 ::res://Art/::1677787260
::res://Art/Characters/::1677787257 ::res://Art/Characters/::1677787257
defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>:: defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>::
::res://Art/Cupcakes/::1678176993 ::res://Art/Cupcakes/::1678176997
ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>:: ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>::
Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>:: Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>::
VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>:: VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>::
@ -25,32 +25,29 @@ yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::
::res://Releases/Linux/v0 Version Zero/::1678095971 ::res://Releases/Linux/v0 Version Zero/::1678095971
::res://Releases/Linux/v0.1 Pre-Alpha/::1678096011 ::res://Releases/Linux/v0.1 Pre-Alpha/::1678096011
::res://Releases/Web/::1678096071 ::res://Releases/Web/::1678096071
::res://Releases/Web/v0 Version Zero/::1678098957 ::res://Releases/Web/v0 Version Zero/::1678185607
CupcakeRevolutionVersionZero-Web.apple-touch-icon.png::CompressedTexture2D::8870549502267300051::1678095404::1678098957::1::::<><>::
CupcakeRevolutionVersionZero-Web.icon.png::CompressedTexture2D::943284379845401684::1678095404::1678098957::1::::<><>::
CupcakeRevolutionVersionZero-Web.png::CompressedTexture2D::6033402053535540009::1678095404::1678098957::1::::<><>::
::res://Releases/Windows/::1678096086 ::res://Releases/Windows/::1678096086
::res://Releases/Windows/v0 Version Zero/::1678096086 ::res://Releases/Windows/v0 Version Zero/::1678096086
::res://Scenes/::1678176168 ::res://Scenes/::1678400136
game_world.tscn::PackedScene::7981802964863433317::1678176168::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q game_world.tscn::PackedScene::7981802964863433317::1678400136::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q<>uid://cpi1m1vg4lscn<>uid://bkrj5vouqpo8n
horse.tscn::PackedScene::8568825373134700876::1678176168::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke horse.tscn::PackedScene::8568825373134700876::1678400136::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke
::res://Scenes/Cupcakes/::1678176420 ::res://Scenes/Cupcakes/::1678400136
chocCupcake.tscn::PackedScene::5843790513687768897::1678176420::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k chocCupcake.tscn::PackedScene::5843790513687768897::1678400136::0::1::::<><>::res://Scripts/Cupcakes/chocCupcake.gd<>uid://bnr06vojcqkqy
cupcake.tscn::PackedScene::8468695979515826288::1678176168::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k cupcake.tscn::PackedScene::8468695979515826288::1678400136::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://brpc5ocwgd8ls
strawCupcake.tscn::PackedScene::3124004694192797727::1678177096::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k strawCupcake.tscn::PackedScene::3124004694192797727::1678400136::0::1::::<><>::res://Scripts/Cupcakes/strawCupcake.gd<>uid://7fqro4fugv8k
::res://Scenes/Locations/::1678176168 ::res://Scenes/Locations/::1678400136
yard.tscn::PackedScene::7883941411178408831::1678176168::0::1::::<><>::uid://b3j662tj6h5vq yard.tscn::PackedScene::7883941411178408831::1678400136::0::1::::<><>::uid://b3j662tj6h5vq
::res://Scenes/UI/::1678176168 ::res://Scenes/UI/::1678400136
ingame_ui.tscn::PackedScene::6815695514927101566::1678176168::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k ingame_ui.tscn::PackedScene::6815695514927101566::1678400136::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy
upgrades.tscn::PackedScene::5871013436024621816::1678176168::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k upgrades.tscn::PackedScene::5871013436024621816::1678400136::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy
::res://Scripts/::1678176067 ::res://Scripts/::1678398331
Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>:: Cupcake Spawn Timer.gd::GDScript::-1::1678186507::0::1::::<>Timer<>::
game_world.gd::GDScript::-1::1678176067::0::1::::<>Node2D<>:: game_world.gd::GDScript::-1::1678400149::0::1::::<>Node2D<>::
horse.gd::GDScript::-1::1678175992::0::1::::<>CharacterBody2D<>:: horse.gd::GDScript::-1::1678184579::0::1::::<>CharacterBody2D<>::
ingame_ui.gd::GDScript::-1::1678173250::0::1::::<>CanvasLayer<>:: ingame_ui.gd::GDScript::-1::1678396600::0::1::::<>CanvasLayer<>::
PlayArea.gd::GDScript::-1::1678064613::0::1::::<>Area2D<>:: PlayArea.gd::GDScript::-1::1678186507::0::1::::<>Area2D<>::
upgrades.gd::GDScript::-1::1678175992::0::1::::<>CanvasLayer<>:: upgrades.gd::GDScript::-1::1678397366::0::1::::<>CanvasLayer<>::
varConst.gd::GDScript::-1::1677895026::0::1::::<>Node<>:: ::res://Scripts/Cupcakes/::1678180708
varVar.gd::GDScript::-1::1678066992::0::1::::<>Node<>:: chocCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>::
::res://Scripts/Cupcakes/::1678073658 cupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>::
cupcake.gd::GDScript::-1::1678073658::0::1::::<>RigidBody2D<>:: strawCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>::

@ -1,15 +1,6 @@
res://Scenes/UI/upgrades.tscn
res://Scripts/game_world.gd
res://Scripts/ingame_ui.gd
res://Scenes/game_world.tscn res://Scenes/game_world.tscn
res://Scenes/horse.tscn res://Scripts/game_world.gd
res://Scenes/Cupcakes/cupcake.tscn res://Scenes/UI/upgrades.tscn
res://Scenes/Locations/yard.tscn
res://Scenes/UI/ingame_ui.tscn res://Scenes/UI/ingame_ui.tscn
res://Scripts/ingame_ui.gd
res://Scripts/upgrades.gd res://Scripts/upgrades.gd
res://Scripts/horse.gd
res://Scenes/Cupcakes/chocCupcake.tscn
res://Scenes/Cupcakes/strawCupcake.tscn
res://Scripts/Cupcakes/chocCupcake.gd
res://Scripts/Cupcakes/cupcake.gd
res://Scripts/Cupcakes/strawCupcake.gd

@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false, "grid_snap_active": false,
"grid_step": Vector2(8, 8), "grid_step": Vector2(8, 8),
"grid_visibility": 1, "grid_visibility": 1,
"ofs": Vector2(-27, -255), "ofs": Vector2(-63.727, -289.72),
"primary_grid_steps": 8, "primary_grid_steps": 8,
"show_edit_locks": true, "show_edit_locks": true,
"show_guides": true, "show_guides": true,
@ -32,7 +32,7 @@ Anim={
"snap_rotation_step": 0.261799, "snap_rotation_step": 0.261799,
"snap_scale": false, "snap_scale": false,
"snap_scale_step": 0.1, "snap_scale_step": 0.1,
"zoom": 1.0 "zoom": 0.749154
} }
3D={ 3D={
"fov": 70.01, "fov": 70.01,

@ -11,7 +11,7 @@ run_reload_scripts=true
[dialog_bounds] [dialog_bounds]
project_settings=Rect2(814, 520, 1120, 920) project_settings=Rect2(814, 520, 1120, 920)
editor_settings=Rect2(830, 580, 900, 700) editor_settings=Rect2(830, 610, 900, 700)
search_help=Rect2(640, 390, 1280, 720) search_help=Rect2(640, 390, 1280, 720)
export=Rect2(830, 640, 900, 700) export=Rect2(830, 640, 900, 700)
@ -21,8 +21,8 @@ recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.092
[recent_files] [recent_files]
scenes=["res://Scenes/Cupcakes/strawCupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/y.tscn"] scenes=["res://Scenes/Cupcakes/strawCupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/y.tscn"]
scripts=["res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "Node", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/upgrades.gd", "res://Scripts/PlayArea.gd", "res://README.md"] scripts=["res://Scripts/upgrades.gd", "res://Scripts/horse.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "Node", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd"]
[script_setup] [script_setup]
@ -35,3 +35,7 @@ advanced_mode=true
[export_options] [export_options]
default_filename="CupcakeRevolutionVersionZero" default_filename="CupcakeRevolutionVersionZero"
[scripts_panel]
show_scripts_panel=true

@ -1,6 +1,6 @@
/bin
res://Scripts/Cupcakes res://Scripts/Cupcakes
/home/shobie/CupcakeRevolution1/Linux /home/shobie/CupcakeRevolution1/Linux
/bin
/home/shobie/CupcakeRevolution1 /home/shobie/CupcakeRevolution1
/home/shobie/CupcakeRevolution1/Web /home/shobie/CupcakeRevolution1/Web
/home/shobie/CupcakeRevolution1/Windows /home/shobie/CupcakeRevolution1/Windows

@ -17,11 +17,11 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 0, "column": 24,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 128, "row": 136,
"scroll_position": 173.0, "scroll_position": 188.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -31,10 +31,10 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 4, "column": 5,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 16, "row": 3,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
@ -76,7 +76,7 @@ state={
"column": 0, "column": 0,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 12, "row": 1,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
@ -87,11 +87,11 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 0, "column": 6,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 31, "row": 126,
"scroll_position": 13.0, "scroll_position": 49.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -101,11 +101,11 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 2, "column": 0,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 24, "row": 85,
"scroll_position": 0.0, "scroll_position": 34.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"
} }
@ -129,10 +129,10 @@ state={
state={ state={
"bookmarks": PackedInt32Array(), "bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(), "breakpoints": PackedInt32Array(),
"column": 76, "column": 19,
"folded_lines": Array[int]([]), "folded_lines": Array[int]([]),
"h_scroll_position": 0, "h_scroll_position": 0,
"row": 5, "row": 7,
"scroll_position": 0.0, "scroll_position": 0.0,
"selection": false, "selection": false,
"syntax_highlighter": "GDScript" "syntax_highlighter": "GDScript"

Binary file not shown.

@ -38,6 +38,38 @@ visible = false
layout_mode = 2 layout_mode = 2
icon = ExtResource("1_vkoxt") icon = ExtResource("1_vkoxt")
[node name="RVel" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Cin" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Honest" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Nightmare" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Rock" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Button6" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Button7" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Button8" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
[node name="Num" type="Control" parent="."] [node name="Num" type="Control" parent="."]
layout_mode = 3 layout_mode = 3
anchors_preset = 0 anchors_preset = 0
@ -46,56 +78,92 @@ offset_top = 15.0
offset_right = 239.0 offset_right = 239.0
offset_bottom = 985.0 offset_bottom = 985.0
[node name="GridContainer" type="GridContainer" parent="Num"] [node name="NumGrid" type="GridContainer" parent="Num"]
layout_mode = 0 layout_mode = 0
offset_left = -30.0 offset_left = -30.0
offset_right = 201.0 offset_right = 201.0
offset_bottom = 968.0 offset_bottom = 968.0
columns = 2 columns = 2
[node name="vanIcon" type="TextureRect" parent="Num/GridContainer"] [node name="vanIcon" type="TextureRect" parent="Num/NumGrid"]
layout_mode = 2 layout_mode = 2
texture = ExtResource("2_65fff") texture = ExtResource("2_65fff")
stretch_mode = 5 stretch_mode = 5
[node name="ccVanNum" type="RichTextLabel" parent="Num/GridContainer"] [node name="ccVanNum" type="RichTextLabel" parent="Num/NumGrid"]
custom_minimum_size = Vector2(256, 0) custom_minimum_size = Vector2(256, 0)
layout_mode = 2 layout_mode = 2
text = "0" text = "0"
fit_content = true fit_content = true
[node name="chocIcon" type="TextureRect" parent="Num/GridContainer"] [node name="chocIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
texture = ExtResource("3_xle4l") texture = ExtResource("3_xle4l")
stretch_mode = 5 stretch_mode = 5
[node name="ccChocNum" type="RichTextLabel" parent="Num/GridContainer"] [node name="ccChocNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
text = "0" text = "0"
fit_content = true fit_content = true
[node name="strawIcon" type="TextureRect" parent="Num/GridContainer"] [node name="strawIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
texture = ExtResource("1_vkoxt") texture = ExtResource("1_vkoxt")
stretch_mode = 5 stretch_mode = 5
[node name="ccStrawNum" type="RichTextLabel" parent="Num/GridContainer"] [node name="ccStrawNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false visible = false
custom_minimum_size = Vector2(256, 0) custom_minimum_size = Vector2(256, 0)
layout_mode = 2 layout_mode = 2
text = "0" text = "0"
fit_content = true fit_content = true
[node name="redVelvetIcon" type="TextureRect" parent="Num/GridContainer"] [node name="redVelvetIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false
layout_mode = 2
texture = ExtResource("3_xle4l")
stretch_mode = 5
[node name="ccRVelNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false
layout_mode = 2
text = "0"
fit_content = true
[node name="cinnamonIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false
layout_mode = 2
texture = ExtResource("3_xle4l")
stretch_mode = 5
[node name="ccCinNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false
layout_mode = 2
text = "0"
fit_content = true
[node name="honestIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false
layout_mode = 2
texture = ExtResource("3_xle4l")
stretch_mode = 5
[node name="ccHonNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false
layout_mode = 2
text = "0"
fit_content = true
[node name="nightmareIcon" type="TextureRect" parent="Num/NumGrid"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
texture = ExtResource("3_xle4l") texture = ExtResource("3_xle4l")
stretch_mode = 5 stretch_mode = 5
[node name="ccRVelvetNum" type="RichTextLabel" parent="Num/GridContainer"] [node name="ccNightNum" type="RichTextLabel" parent="Num/NumGrid"]
visible = false visible = false
layout_mode = 2 layout_mode = 2
text = "0" text = "0"
@ -126,3 +194,8 @@ grow_vertical = 2
[connection signal="pressed" from="Main/HBoxContainer/Van" to="." method="_on_van_pressed"] [connection signal="pressed" from="Main/HBoxContainer/Van" to="." method="_on_van_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Choc" to="." method="_on_choc_pressed"] [connection signal="pressed" from="Main/HBoxContainer/Choc" to="." method="_on_choc_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Straw" to="." method="_on_straw_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/RVel" to="." method="_on_r_vel_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Cin" to="." method="_on_cin_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Honest" to="." method="_on_honest_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Nightmare" to="." method="_on_nightmare_pressed"]

@ -271,6 +271,666 @@ text = "50000"
layout_mode = 2 layout_mode = 2
text = "Buy" text = "Buy"
[node name="StrawScroll" type="ScrollContainer" parent="Control"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="StrawGrid" type="GridContainer" parent="Control/StrawScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="StrawLabel" type="Label" parent="Control/StrawScroll/StrawGrid"]
layout_mode = 2
text = "Strawberry Cupcake Upgrades"
[node name="StrawUp1" type="HBoxContainer" parent="Control/StrawScroll/StrawGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/StrawScroll/StrawGrid/StrawUp1"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/StrawScroll/StrawGrid/StrawUp1"]
layout_mode = 2
text = "Buy"
[node name="StrawUp2" type="HBoxContainer" parent="Control/StrawScroll/StrawGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/StrawScroll/StrawGrid/StrawUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/StrawScroll/StrawGrid/StrawUp2"]
layout_mode = 2
text = "Buy"
[node name="StrawUp3" type="HBoxContainer" parent="Control/StrawScroll/StrawGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/StrawScroll/StrawGrid/StrawUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/StrawScroll/StrawGrid/StrawUp3"]
layout_mode = 2
text = "Buy"
[node name="StrawUp4" type="HBoxContainer" parent="Control/StrawScroll/StrawGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/StrawScroll/StrawGrid/StrawUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp4"]
layout_mode = 2
text = "Red Velvet Cupcakes"
[node name="Desc" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp4"]
layout_mode = 2
text = "Unlock Red Velvet Cupcakes"
[node name="Price" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp4"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/StrawScroll/StrawGrid/StrawUp4"]
layout_mode = 2
text = "Buy"
[node name="RVelScroll" type="ScrollContainer" parent="Control"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="RVelGrid" type="GridContainer" parent="Control/RVelScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="RVelLabel" type="Label" parent="Control/RVelScroll/RVelGrid"]
layout_mode = 2
text = "Red Velvet Cupcake Upgrades"
[node name="RvelUp1" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RvelUp1"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RvelUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/RVelScroll/RVelGrid/RvelUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/RVelScroll/RVelGrid/RvelUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RvelUp1"]
layout_mode = 2
text = "Buy"
[node name="RVelUp2" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RVelUp2"]
layout_mode = 2
text = "Buy"
[node name="RVelUp3" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RVelUp3"]
layout_mode = 2
text = "Buy"
[node name="RVelUp4" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp4"]
layout_mode = 2
text = "Cinnamon Cupcakes"
[node name="Desc" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp4"]
layout_mode = 2
text = "Unlock Cinnamon Cupcakes"
[node name="Price" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp4"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RVelUp4"]
layout_mode = 2
text = "Buy"
[node name="CinScroll" type="ScrollContainer" parent="Control"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="CinGrid" type="GridContainer" parent="Control/CinScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="CinLabel" type="Label" parent="Control/CinScroll/CinGrid"]
layout_mode = 2
text = "Cinnamon Cupcake Upgrades"
[node name="CinUp1" type="HBoxContainer" parent="Control/CinScroll/CinGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp1"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/CinScroll/CinGrid/CinUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/CinScroll/CinGrid/CinUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/CinScroll/CinGrid/CinUp1"]
layout_mode = 2
text = "Buy"
[node name="CinUp2" type="HBoxContainer" parent="Control/CinScroll/CinGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/CinScroll/CinGrid/CinUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/CinScroll/CinGrid/CinUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/CinScroll/CinGrid/CinUp2"]
layout_mode = 2
text = "Buy"
[node name="CinUp3" type="HBoxContainer" parent="Control/CinScroll/CinGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/CinScroll/CinGrid/CinUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/CinScroll/CinGrid/CinUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/CinScroll/CinGrid/CinUp3"]
layout_mode = 2
text = "Buy"
[node name="CinUp4" type="HBoxContainer" parent="Control/CinScroll/CinGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp4"]
layout_mode = 2
text = "Honest Cupcakes"
[node name="Desc" type="Label" parent="Control/CinScroll/CinGrid/CinUp4"]
layout_mode = 2
text = "Unlock Honest Cupcakes"
[node name="Price" type="Label" parent="Control/CinScroll/CinGrid/CinUp4"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/CinScroll/CinGrid/CinUp4"]
layout_mode = 2
text = "Buy"
[node name="HonScroll" type="ScrollContainer" parent="Control"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="HonGrid" type="GridContainer" parent="Control/HonScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="HonLabel" type="Label" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
text = "Honest Cupcake Upgrades"
[node name="HonUp1" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp1"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp1"]
layout_mode = 2
text = "Buy"
[node name="HonUp2" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp2"]
layout_mode = 2
text = "Buy"
[node name="HonUp3" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp3"]
layout_mode = 2
text = "Buy"
[node name="HonUp4" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp4"]
layout_mode = 2
text = "Nightmare Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp4"]
layout_mode = 2
text = "Unlock Nightmare Cupcakes"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp4"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp4"]
layout_mode = 2
text = "Buy"
[node name="HonUp5" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp5"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp5"]
layout_mode = 2
text = "Nightmare Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp5"]
layout_mode = 2
text = "Unlock Nightmare Cupcakes"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp5"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp5"]
layout_mode = 2
text = "Buy"
[node name="HonUp6" type="HBoxContainer" parent="Control/HonScroll/HonGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/HonScroll/HonGrid/HonUp6"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/HonScroll/HonGrid/HonUp6"]
layout_mode = 2
text = "Nightmare Cupcakes"
[node name="Desc" type="Label" parent="Control/HonScroll/HonGrid/HonUp6"]
layout_mode = 2
text = "Unlock Nightmare Cupcakes"
[node name="Price" type="Label" parent="Control/HonScroll/HonGrid/HonUp6"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/HonScroll/HonGrid/HonUp6"]
layout_mode = 2
text = "Buy"
[node name="NightScroll" type="ScrollContainer" parent="Control"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="NightGrid" type="GridContainer" parent="Control/NightScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="NightLabel" type="Label" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
text = "Nightmare Cupcake Upgrades"
[node name="NightUp1" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp1"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp1"]
layout_mode = 2
text = "Buy"
[node name="NightUp2" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp2"]
layout_mode = 2
text = "Buy"
[node name="NightUp3" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp3"]
layout_mode = 2
text = "Buy"
[node name="NightUp4" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp4"]
layout_mode = 2
text = "Rock Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp4"]
layout_mode = 2
text = "Unlock Red Velvet Cupcakes"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp4"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp4"]
layout_mode = 2
text = "Buy"
[node name="NightUp5" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp5"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp5"]
layout_mode = 2
text = "Rock Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp5"]
layout_mode = 2
text = "Unlock Red Velvet Cupcakes"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp5"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp5"]
layout_mode = 2
text = "Buy"
[node name="NightUp6" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp6"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp6"]
layout_mode = 2
text = "Rock Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp6"]
layout_mode = 2
text = "Unlock Red Velvet Cupcakes"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp6"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp6"]
layout_mode = 2
text = "Buy"
[node name="NightUp7" type="HBoxContainer" parent="Control/NightScroll/NightGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/NightScroll/NightGrid/NightUp7"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/NightScroll/NightGrid/NightUp7"]
layout_mode = 2
text = "Rock Cupcakes"
[node name="Desc" type="Label" parent="Control/NightScroll/NightGrid/NightUp7"]
layout_mode = 2
text = "Unlock Red Velvet Cupcakes"
[node name="Price" type="Label" parent="Control/NightScroll/NightGrid/NightUp7"]
layout_mode = 2
text = "75000"
[node name="Buy" type="Button" parent="Control/NightScroll/NightGrid/NightUp7"]
layout_mode = 2
text = "Buy"
[connection signal="pressed" from="Close" to="." method="_on_close_pressed"] [connection signal="pressed" from="Close" to="." method="_on_close_pressed"]
[connection signal="pressed" from="Control/VanScroll/VanGrid/VanUp1/Buy" to="." method="_on_buy_pressed"] [connection signal="pressed" from="Control/VanScroll/VanGrid/VanUp1/Buy" to="." method="_on_buy_pressed"]
[connection signal="pressed" from="Control/VanScroll/VanGrid/VanUp2/Buy" to="." method="_on_buy_van2_pressed"] [connection signal="pressed" from="Control/VanScroll/VanGrid/VanUp2/Buy" to="." method="_on_buy_van2_pressed"]
@ -280,3 +940,24 @@ text = "Buy"
[connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp2/Buy" to="." method="_on_buy_choc2_pressed"] [connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp2/Buy" to="." method="_on_buy_choc2_pressed"]
[connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp3/Buy" to="." method="_on_buy_choc3_pressed"] [connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp3/Buy" to="." method="_on_buy_choc3_pressed"]
[connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp4/Buy" to="." method="_on_buy_choc4_pressed"] [connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp4/Buy" to="." method="_on_buy_choc4_pressed"]
[connection signal="pressed" from="Control/StrawScroll/StrawGrid/StrawUp1/Buy" to="." method="_on_buy_straw1_pressed"]
[connection signal="pressed" from="Control/StrawScroll/StrawGrid/StrawUp2/Buy" to="." method="_on_buy_straw2_pressed"]
[connection signal="pressed" from="Control/StrawScroll/StrawGrid/StrawUp3/Buy" to="." method="_on_buy_straw3_pressed"]
[connection signal="pressed" from="Control/StrawScroll/StrawGrid/StrawUp4/Buy" to="." method="_on_buy_straw4_pressed"]
[connection signal="pressed" from="Control/RVelScroll/RVelGrid/RvelUp1/Buy" to="." method="_on_buy_rvel1_pressed"]
[connection signal="pressed" from="Control/RVelScroll/RVelGrid/RVelUp2/Buy" to="." method="_on_buy_rvel2_pressed"]
[connection signal="pressed" from="Control/RVelScroll/RVelGrid/RVelUp3/Buy" to="." method="_on_buy_rvel3_pressed"]
[connection signal="pressed" from="Control/RVelScroll/RVelGrid/RVelUp4/Buy" to="." method="_on_buy_rvel4_pressed"]
[connection signal="pressed" from="Control/CinScroll/CinGrid/CinUp1/Buy" to="." method="_on_buy_cin1_pressed"]
[connection signal="pressed" from="Control/CinScroll/CinGrid/CinUp2/Buy" to="." method="_on_buy_cin2_pressed"]
[connection signal="pressed" from="Control/CinScroll/CinGrid/CinUp3/Buy" to="." method="_on_buy_cin3_pressed"]
[connection signal="pressed" from="Control/CinScroll/CinGrid/CinUp4/Buy" to="." method="_on_buy_cin4_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp1/Buy" to="." method="_on_buy_hon1_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp2/Buy" to="." method="_on_buy_hon2_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp3/Buy" to="." method="_on_buy_hon3_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp4/Buy" to="." method="_on_buy_hon4_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp5/Buy" to="." method="_on_buy_hon4_pressed"]
[connection signal="pressed" from="Control/HonScroll/HonGrid/HonUp6/Buy" to="." method="_on_buy_hon4_pressed"]
[connection signal="pressed" from="Control/NightScroll/NightGrid/NightUp1/Buy" to="." method="_on_buy_night1_pressed"]
[connection signal="pressed" from="Control/NightScroll/NightGrid/NightUp2/Buy" to="." method="_on_buy_night2_pressed"]
[connection signal="pressed" from="Control/NightScroll/NightGrid/NightUp3/Buy" to="." method="_on_buy_night3_pressed"]

@ -50,9 +50,32 @@ position = Vector2(957, 539)
shape = SubResource("RectangleShape2D_g5fj2") shape = SubResource("RectangleShape2D_g5fj2")
[connection signal="condensedCupcake1" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_1"] [connection signal="condensedCupcake1" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_1"]
[connection signal="condensedCupcake2" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_2"]
[connection signal="condensedCupcake3" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_3"]
[connection signal="condensedCupcake4" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_4"]
[connection signal="condensedCupcake5" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_5"]
[connection signal="condensedCupcake6" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_6"]
[connection signal="cupcakeDamage" from="Upgrades" to="." method="_on_upgrades_cupcake_damage"]
[connection signal="fasterCupcake" from="Upgrades" to="." method="_on_upgrades_faster_cupcake"] [connection signal="fasterCupcake" from="Upgrades" to="." method="_on_upgrades_faster_cupcake"]
[connection signal="fasterCupcake2" from="Upgrades" to="." method="_on_upgrades_faster_cupcake_2"]
[connection signal="fasterCupcake3" from="Upgrades" to="." method="_on_upgrades_faster_cupcake_3"]
[connection signal="fasterCupcake4" from="Upgrades" to="." method="_on_upgrades_faster_cupcake_4"]
[connection signal="fasterCupcake5" from="Upgrades" to="." method="_on_upgrades_faster_cupcake_5"]
[connection signal="fasterCupcake6" from="Upgrades" to="." method="_on_upgrades_faster_cupcake_6"]
[connection signal="horseHealth" from="Upgrades" to="." method="_on_upgrades_horse_health"]
[connection signal="oneMoreCupcake" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake"] [connection signal="oneMoreCupcake" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake"]
[connection signal="oneMoreCupcake2" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake_2"]
[connection signal="oneMoreCupcake3" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake_3"]
[connection signal="oneMoreCupcake4" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake_4"]
[connection signal="oneMoreCupcake5" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake_5"]
[connection signal="oneMoreCupcake6" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake_6"]
[connection signal="sweetieDamage" from="Upgrades" to="." method="_on_upgrades_sweetie_damage"]
[connection signal="unlockChoc" from="Upgrades" to="." method="_on_upgrades_unlock_choc"] [connection signal="unlockChoc" from="Upgrades" to="." method="_on_upgrades_unlock_choc"]
[connection signal="unlockCin" from="Upgrades" to="." method="_on_upgrades_unlock_cin"]
[connection signal="unlockHon" from="Upgrades" to="." method="_on_upgrades_unlock_hon"]
[connection signal="unlockNightmare" from="Upgrades" to="." method="_on_upgrades_unlock_nightmare"]
[connection signal="unlockRVel" from="Upgrades" to="." method="_on_upgrades_unlock_r_vel"]
[connection signal="unlockStraw" from="Upgrades" to="." method="_on_upgrades_unlock_straw"]
[connection signal="timeout" from="Cupcake Spawn Timer" to="." method="_on_timeout"] [connection signal="timeout" from="Cupcake Spawn Timer" to="." method="_on_timeout"]
[connection signal="ccVanCollected" from="Cupcakes/VanCupcake" to="." method="_on_van_cupcake_cc_van_collected"] [connection signal="ccVanCollected" from="Cupcakes/VanCupcake" to="." method="_on_van_cupcake_cc_van_collected"]
[connection signal="ccChocCollected" from="Cupcakes/ChocCupcake" to="." method="_on_choc_cupcake_cc_choc_collected"] [connection signal="ccChocCollected" from="Cupcakes/ChocCupcake" to="." method="_on_choc_cupcake_cc_choc_collected"]

@ -1,19 +1,4 @@
extends Timer extends Timer
var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccChocolate = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccStrawberry = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
#var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
func _ready():
pass
func _on_timeout(): func _on_timeout():
pass pass

@ -1,13 +1,2 @@
extends Area2D extends Area2D
var horse = preload("res://Scripts/horse.gd")
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass

@ -1,9 +1,5 @@
extends Node2D extends Node2D
signal condensedCupcake1()
signal condensedCupcake2()
signal condensedCupcake3()
#Cupcake Values #Cupcake Values
var ccVanNum: int = 0 var ccVanNum: int = 0
var ccVanValue: int = 1 var ccVanValue: int = 1
@ -12,9 +8,11 @@ var ccChocValue: int = 1
var ccStrawNum: int = 0 var ccStrawNum: int = 0
var ccStrawValue: int = 1 var ccStrawValue: int = 1
var ccRVelNum: int = 0 var ccRVelNum: int = 0
var ccCRVelValue: int = 1 var ccRVelValue: int = 1
var ccCinNum: int = 0 var ccCinNum: int = 0
var ccCinValue: int = 1 var ccCinValue: int = 1
var ccHonNum: int = 0
var ccHonValue: int = 1
var ccNightmareNum: int = 0 var ccNightmareNum: int = 0
var ccNightmareValue: int = 1 var ccNightmareValue: int = 1
@ -24,17 +22,46 @@ var ccVanPrice2: int = 15
var ccVanPrice3: int = 15 var ccVanPrice3: int = 15
var ccVanPrice4: int = 250 var ccVanPrice4: int = 250
var ccChocPrice: int = 10 var ccChocPrice: int = 10
var ccChocPrice2: int var ccChocPrice2: int = 15
var ccChocPrice3: int var ccChocPrice3: int = 15
var ccChocPrice4: int var ccChocPrice4: int = 500
var ccChocPrice5: int var ccChocPrice5: int
var ccChocPrice6: int var ccChocPrice6: int
var ccStrawPrice: int var ccStrawPrice: int = 10
var ccStrawPrice2: int var ccStrawPrice2: int = 15
var ccStrawPrice3: int var ccStrawPrice3: int = 15
var ccStrawPrice4: int var ccStrawPrice4: int = 750
var ccStrawPrice5: int var ccStrawPrice5: int = 150
var ccStrawPrice6: int var ccStrawPrice6: int = 200
var ccRVelPrice: int = 10
var ccRVelPrice2: int = 15
var ccRVelPrice3: int = 15
var ccRVelPrice4: int = 1000
var ccCinPrice: int = 10
var ccCinPrice2: int = 15
var ccCinPrice3: int = 15
var ccCinPrice4: int = 1250
var ccNonPrice: int = 10
var ccHonPrice2: int = 15
var ccHonPrice3: int = 15
var ccHonPrice4: int = 1500
var ccNightPrice: int = 10
var ccNightPrice2: int = 15
var ccNightPrice3: int = 15
var ccNightPrice4: int = 1750
#Upgrade counts
var vanUpNum1: int = 0
var vanUpNum2: int = 0
var vanUpNum3: int = 0
var vanUpNum4: int = 0
var chocUpNum1: int = 0
var chocUpNum2: int = 0
var chocUpNum3: int = 0
var chocUpNum4: int = 0
var chocUpNum5: int = 0
var chocUpNum6: int = 0
var strawUpNum1: int = 0
#Preloaded scenes and scripts #Preloaded scenes and scripts
var upgradeUI = preload("res://Scenes/UI/upgrades.tscn") var upgradeUI = preload("res://Scenes/UI/upgrades.tscn")
@ -46,32 +73,38 @@ var ccChocolate = preload("res://Scenes/Cupcakes/chocCupcake.tscn")
var ccStrawberry = preload("res://Scenes/Cupcakes/strawCupcake.tscn") var ccStrawberry = preload("res://Scenes/Cupcakes/strawCupcake.tscn")
var ccRedVelvet var ccRedVelvet
var ccCinnamon var ccCinnamon
var ccHonest
var ccNightmare var ccNightmare
var ccRock var ccRock
var ccRuby var ccRuby
var ccSapphire var ccSapphire
var ccEmerald var ccEmerald
var ccDiamond var ccDiamond
var ccLoyal
var ccChaos var ccChaos
#Instantiations #Instantiations
var ccVan = ccVanilla.instantiate() var ccVan = ccVanilla.instantiate()
var ccChoc = ccChocolate.instantiate() var ccChoc = ccChocolate.instantiate()
var ccStraw = ccStrawberry.instantiate() var ccStraw = ccStrawberry.instantiate()
var ccRVel var ccRVel = ccRedVelvet
var ccNight var ccCin = ccCinnamon
var ccRoc var ccHon = ccHonest
var ccRub var ccNight = ccNightmare
var ccSap var ccRoc = ccRock
var ccEme var ccRub = ccRuby
var ccDia var ccSap = ccSapphire
var ccCha var ccEme = ccEmerald
var ccDia = ccDiamond
var ccLoy = ccLoyal
var ccCha = ccChaos
#Cupcake Locks #Cupcake Locks
var ccChocLocked = true var ccChocLocked = true
var ccStrawLocked = true var ccStrawLocked = true
var ccRVelLocked = true var ccRVelLocked = true
var ccCinLocked = true var ccCinLocked = true
var ccHonLocked = true
var ccNightLocked = true var ccNightLocked = true
var ccRocLocked = true var ccRocLocked = true
var ccRubLocked = true var ccRubLocked = true
@ -81,9 +114,9 @@ var ccDiaLocked = true
var ccChaLocked = true var ccChaLocked = true
#Spawnrates #Spawnrates
var ccVanSpawnRate = 60 var ccVanSpawnRate = 30
var ccChocSpawnRate = 3 var ccChocSpawnRate = 30
var ccStrawSpawnRate = 3 var ccStrawSpawnRate = 30
var ccRVelSpawnRate = 3 var ccRVelSpawnRate = 3
var ccNightSpawnRate = 3 var ccNightSpawnRate = 3
var ccRocSpawnRate = 3 var ccRocSpawnRate = 3
@ -93,13 +126,18 @@ var ccEmeSpawnRate = 3
var ccDiaSpawnRate = 3 var ccDiaSpawnRate = 3
var ccChaSpawnRate = 3 var ccChaSpawnRate = 3
#Combo
var comboLocked = true
var combo = 1.00
var comboMultiplier
#Other #Other
@onready var timer = get_node("Cupcake Spawn Timer") @onready var timer = get_node("Cupcake Spawn Timer")
var horseAttached = true var horseAttached = true
var horse_instance var horse_instance
var mouse_position = Vector2.ZERO var mouse_position = Vector2.ZERO
var ccCount = 0 var ccCount = 0
var ccMaxOnScreen = 2000 var ccMaxOnScreen = 3000
#General #General
func _ready(): func _ready():
@ -123,9 +161,13 @@ func handleInput():
horseAttached = true horseAttached = true
func collectCupcakes(): func collectCupcakes():
$InGameUI/Num/GridContainer/ccVanNum.text = str(ccVanNum) $InGameUI/Num/NumGrid/ccVanNum.text = str(ccVanNum)
$InGameUI/Num/GridContainer/ccChocNum.text = str(ccChocNum) $InGameUI/Num/NumGrid/ccChocNum.text = str(ccChocNum)
$InGameUI/Num/GridContainer/ccStrawNum.text = str(ccStrawNum) $InGameUI/Num/NumGrid/ccStrawNum.text = str(ccStrawNum)
$InGameUI/Num/NumGrid/ccRVelNum.text = str(ccRVelNum)
$InGameUI/Num/NumGrid/ccCinNum.text = str(ccCinNum)
$InGameUI/Num/NumGrid/ccHonNum.text = str(ccHonNum)
$InGameUI/Num/NumGrid/ccNightNum.text = str(ccNightmareNum)
func _on_timeout(): func _on_timeout():
spawnVanCupcakes() spawnVanCupcakes()
@ -133,6 +175,15 @@ func _on_timeout():
spawnChocCupcakes() spawnChocCupcakes()
if ccStrawLocked == false: if ccStrawLocked == false:
spawnStrawCupcakes() spawnStrawCupcakes()
if ccRVelLocked == false:
spawnRVelCupcakes()
if ccCinLocked == false:
spawnCinCupcakes()
if ccHonLocked == false:
spawnHonCupcakes()
if ccNightLocked == false:
spawnNightCupcakes()
collectCupcakes() collectCupcakes()
timer.start timer.start
@ -148,7 +199,6 @@ func spawnVanCupcakes():
ccVan.position = Vector2(randX, randY) ccVan.position = Vector2(randX, randY)
$Cupcakes.add_child(ccVan.duplicate()) $Cupcakes.add_child(ccVan.duplicate())
ccCount = ccCount + ccVanSpawnRate ccCount = ccCount + ccVanSpawnRate
func spawnChocCupcakes(): func spawnChocCupcakes():
var randX var randX
@ -174,21 +224,37 @@ func spawnStrawCupcakes():
$Cupcakes.add_child(ccStraw.duplicate()) $Cupcakes.add_child(ccStraw.duplicate())
ccCount = ccCount + ccStrawSpawnRate ccCount = ccCount + ccStrawSpawnRate
#Upgrades func spawnRVelCupcakes():
pass
func spawnCinCupcakes():
pass
func spawnHonCupcakes():
pass
func spawnNightCupcakes():
pass
###Upgrades###
#Vanilla
func _on_upgrades_one_more_cupcake(): func _on_upgrades_one_more_cupcake():
if ccVanNum >= ccVanPrice: if ccVanNum >= ccVanPrice:
ccVanSpawnRate += 1 ccVanSpawnRate += 1
ccVanNum -= ccVanPrice ccVanNum -= ccVanPrice
ccVanPrice = ccVanPrice * 1.3 ccVanPrice = ccVanPrice * 1.3
vanUpNum1 += 1
$Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice) $Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice)
collectCupcakes() collectCupcakes()
func _on_upgrades_faster_cupcake(): func _on_upgrades_faster_cupcake():
if ccVanNum >= ccVanPrice2: if ccVanNum >= ccVanPrice2:
ccVanNum -= ccVanPrice2 ccVanNum -= ccVanPrice2
ccVanPrice2 = ccVanPrice2 * 1.3 ccVanPrice2 = ccVanPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
vanUpNum2 += 1
$Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2) $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2)
collectCupcakes() collectCupcakes()
@ -197,17 +263,158 @@ func _on_upgrades_condensed_cupcake_1():
ccVanNum -= ccVanPrice3 ccVanNum -= ccVanPrice3
ccVanPrice3 = ccVanPrice3 * 1.3 ccVanPrice3 = ccVanPrice3 * 1.3
ccVanValue += 1 ccVanValue += 1
vanUpNum3 += 1
$Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccVanPrice3) $Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccVanPrice3)
collectCupcakes() collectCupcakes()
#Chocolate
func _on_upgrades_one_more_cupcake_2():
if ccChocNum >= ccChocPrice:
ccChocSpawnRate += 1
ccChocNum -= ccChocPrice
ccChocPrice = ccChocPrice * 1.3
chocUpNum1 += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp1/Price.text = str(ccChocPrice)
collectCupcakes()
func _on_upgrades_faster_cupcake_2():
if ccChocNum >= ccChocPrice2:
ccChocNum -= ccChocPrice2
ccChocPrice2 = ccChocPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
chocUpNum2 += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp2/Price.text = str(ccChocPrice2)
collectCupcakes()
func _on_upgrades_condensed_cupcake_2():
if ccChocNum >= ccChocPrice3:
ccChocNum -= ccChocPrice3
ccChocPrice3 = ccChocPrice3 * 1.3
ccChocValue += 1
chocUpNum3 += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccChocPrice3)
collectCupcakes()
#Strawberry
func _on_upgrades_one_more_cupcake_3():
if ccStrawNum >= ccStrawPrice:
ccStrawSpawnRate += 1
ccStrawNum -= ccStrawPrice
ccStrawPrice = ccStrawPrice * 1.3
strawUpNum1 += 1
$Upgrades/Control/StrawScroll/StrawGrid/StrawUp1/Price.text = str(ccStrawPrice)
collectCupcakes()
func _on_upgrades_faster_cupcake_3():
if ccStrawNum >= ccStrawPrice2:
ccStrawNum -= ccStrawPrice2
ccStrawPrice2 = ccStrawPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
$Upgrades/Control/StrawScroll/StrawGrid/StrawUp2/Price.text = str(ccStrawPrice2)
collectCupcakes()
func _on_upgrades_condensed_cupcake_3():
if ccStrawNum >= ccStrawPrice3:
ccStrawNum -= ccStrawPrice3
ccStrawPrice3 = ccStrawPrice3 * 1.3
ccStrawValue += 1
$Upgrades/Control/StrawScroll/StrawGrid/StrawUp3/Price.text = str(ccStrawPrice3)
collectCupcakes()
#Red Velvet
func _on_upgrades_one_more_cupcake_4():
if ccChocNum >= ccChocPrice:
ccChocSpawnRate += 1
ccChocNum -= ccChocPrice
ccVanPrice = ccVanPrice * 1.3
$Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccChocPrice)
collectCupcakes()
func _on_upgrades_faster_cupcake_4():
if ccChocNum >= ccChocPrice2:
ccChocNum -= ccChocPrice2
ccChocPrice2 = ccChocPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
$Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2)
collectCupcakes()
func _on_upgrades_condensed_cupcake_4():
if ccChocNum >= ccChocPrice3:
ccChocNum -= ccChocPrice3
ccChocPrice3 = ccChocPrice3 * 1.3
ccChocValue += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccChocPrice3)
collectCupcakes()
#Cinnamon
func _on_upgrades_one_more_cupcake_5():
if ccChocNum >= ccChocPrice:
ccChocSpawnRate += 1
ccChocNum -= ccChocPrice
ccVanPrice = ccVanPrice * 1.3
$Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccChocPrice)
collectCupcakes()
func _on_upgrades_faster_cupcake_5():
if ccChocNum >= ccChocPrice2:
ccChocNum -= ccChocPrice2
ccChocPrice2 = ccChocPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
$Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2)
collectCupcakes()
func _on_upgrades_condensed_cupcake_5():
if ccChocNum >= ccChocPrice3:
ccChocNum -= ccChocPrice3
ccChocPrice3 = ccChocPrice3 * 1.3
ccChocValue += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccChocPrice3)
collectCupcakes()
#Honest
func _on_upgrades_condensed_cupcake_6():
if ccChocNum >= ccChocPrice:
ccChocSpawnRate += 1
ccChocNum -= ccChocPrice
ccVanPrice = ccVanPrice * 1.3
$Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccChocPrice)
collectCupcakes()
func _on_upgrades_faster_cupcake_6():
if ccChocNum >= ccChocPrice2:
ccChocNum -= ccChocPrice2
ccChocPrice2 = ccChocPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
$Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2)
collectCupcakes()
func _on_upgrades_one_more_cupcake_6():
if ccChocNum >= ccChocPrice3:
ccChocNum -= ccChocPrice3
ccChocPrice3 = ccChocPrice3 * 1.3
ccChocValue += 1
$Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccChocPrice3)
collectCupcakes()
func _on_upgrades_cupcake_damage():
pass
func _on_upgrades_horse_health():
pass
func _on_upgrades_sweetie_damage():
pass
#Nightmare
#Unlock #Unlock
func _on_upgrades_unlock_choc(): func _on_upgrades_unlock_choc():
if ccVanNum >= ccVanPrice4: if ccVanNum >= ccVanPrice4:
ccVanNum -= ccVanPrice4 ccVanNum -= ccVanPrice4
ccChocLocked = false ccChocLocked = false
$"InGameUI/Main/HBoxContainer/Choc".visible = true $"InGameUI/Main/HBoxContainer/Choc".visible = true
$"InGameUI/Num/GridContainer/chocIcon".visible = true $"InGameUI/Num/NumGrid/chocIcon".visible = true
$"InGameUI/Num/GridContainer/ccChocNum".visible = true $"InGameUI/Num/NumGrid/ccChocNum".visible = true
$"Upgrades/Control/VanScroll/VanGrid/VanUp4/Buy".visible = false $"Upgrades/Control/VanScroll/VanGrid/VanUp4/Buy".visible = false
func _on_upgrades_unlock_straw(): func _on_upgrades_unlock_straw():
@ -215,27 +422,84 @@ func _on_upgrades_unlock_straw():
ccChocNum -= ccChocPrice4 ccChocNum -= ccChocPrice4
ccStrawLocked = false ccStrawLocked = false
$"InGameUI/Main/HBoxContainer/Straw".visible = true $"InGameUI/Main/HBoxContainer/Straw".visible = true
$"InGameUI/Num/GridContainer/strawIcon".visible = true $"InGameUI/Num/NumGrid/strawIcon".visible = true
$"InGameUI/Num/GridContainer/ccStrawNum".visible = true $"InGameUI/Num/NumGrid/ccStrawNum".visible = true
$"Upgrades/Control/ChocScroll/ChocGrid/ChocUp4/Buy".visible = false $"Upgrades/Control/ChocScroll/ChocGrid/ChocUp4/Buy".visible = false
func _on_upgrades_unlock_r_vel():
if ccStrawNum >= ccStrawPrice4:
ccStrawNum -= ccStrawPrice4
ccRVelLocked = false
$"InGameUI/Main/HBoxContainer/Rvel".visible = true
$"InGameUI/Num/NumGrid/rvelIcon".visible = true
$"InGameUI/Num/NumGrid/ccRVelNum".visible = true
$"Upgrades/Control/RVelScroll/RVelGrid/RVelUp4/Buy".visible = false
func _on_upgrades_unlock_cin():
if ccRVelNum >= ccRVelPrice4:
ccRVelNum -= ccRVelPrice4
ccCinLocked = false
$"InGameUI/Main/HBoxContainer/Cin".visible = true
$"InGameUI/Num/NumGrid/cinIcon".visible = true
$"InGameUI/Num/NumGrid/ccCinNum".visible = true
$"Upgrades/Control/CinScroll/CinGrid/CinUp4/Buy".visible = false
func _on_upgrades_unlock_hon():
if ccCinNum >= ccCinPrice4:
ccCinNum -= ccCinPrice4
ccHonLocked = false
$"InGameUI/Main/HBoxContainer/Honest".visible = true
$"InGameUI/Num/NumGrid/honIcon".visible = true
$"InGameUI/Num/NumGrid/ccHonNum".visible = true
$"Upgrades/Control/HonScroll/HonGrid/HonUp4/Buy".visible = false
func _on_upgrades_unlock_nightmare():
if ccHonNum >= ccHonPrice4:
ccHonNum -= ccHonPrice4
ccNightLocked = false
$"InGameUI/Main/HBoxContainer/Night".visible = true
$"InGameUI/Num/NumGrid/nightIcon".visible = true
$"InGameUI/Num/NumGrid/ccNightNum".visible = true
$"Upgrades/Control/NightScroll/NightGrid/NightUp4/Buy".visible = false
#Collect #Collect
func _on_van_cupcake_cc_van_collected(): func _on_van_cupcake_cc_van_collected():
ccVanNum += ccVanValue ccVanNum += ccVanValue
ccCount -= 1 ccCount -= 1
collectCupcakes() collectCupcakes()
func _on_choc_cupcake_cc_choc_collected(): func _on_choc_cupcake_cc_choc_collected():
ccChocNum += ccChocValue ccChocNum += ccChocValue
ccCount -= 1 ccCount -= 1
collectCupcakes() collectCupcakes()
func _on_straw_cupcake_cc_straw_collected(): func _on_straw_cupcake_cc_straw_collected():
ccStrawNum += ccStrawValue ccStrawNum += ccStrawValue
ccCount -= 1 ccCount -= 1
collectCupcakes() collectCupcakes()
func _on_rvel_cupcake_cc_rvel_collected():
ccRVelNum += ccRVelValue
ccCount -= 1
collectCupcakes()
func _on_cin_cupcake_cc_cin_collected():
ccCinNum += ccCinValue
ccCount -= 1
collectCupcakes()
func _on_honest_cupcake_cc_hon_collected():
ccHonNum += ccHonValue
ccCount -= 1
collectCupcakes()
func _on_night_cupcake_cc_night_collected():
ccHonNum += ccHonValue
ccCount -= 1
collectCupcakes()

@ -1,33 +1,90 @@
extends CanvasLayer extends CanvasLayer
@onready var upgrades = $"../Upgrades" @onready var upgrades = $"../Upgrades"
@onready var allUp = $"../Upgrades/Control".get_children()
@onready var vanUp = $"../Upgrades/Control/VanScroll" @onready var vanUp = $"../Upgrades/Control/VanScroll"
@onready var chocUp = $"../Upgrades/Control/ChocScroll" @onready var chocUp = $"../Upgrades/Control/ChocScroll"
@onready var strawUp = $"../Upgrades/Control/StrawScroll"
@onready var rvelUp = $"../Upgrades/Control/RVelScroll"
@onready var cinUp = $"../Upgrades/Control/CinScroll"
@onready var honUp = $"../Upgrades/Control/HonScroll"
@onready var nightUp = $"../Upgrades/Control/NightScroll"
# Called when the node enters the scene tree for the first time. func _on_van_pressed():
func _ready(): if vanUp.visible == false:
pass # Replace with function body. for child in allUp:
child.visible = false
vanUp.visible = true
else:
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
func _on_choc_pressed():
if chocUp.visible == false:
for child in allUp:
child.visible = false
chocUp.visible = true
else:
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
func _on_straw_pressed():
if strawUp.visible == false:
for child in allUp:
child.visible = false
strawUp.visible = true
else:
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
# Called every frame. 'delta' is the elapsed time since the previous frame. func _on_r_vel_pressed():
func _process(delta): if rvelUp.visible == false:
pass for child in allUp:
child.visible = false
rvelUp.visible = true
else:
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
func _on_van_pressed(): func _on_cin_pressed():
if vanUp.visible == false: if cinUp.visible == false:
vanUp.visible = true for child in allUp:
chocUp.visible = false child.visible = false
cinUp.visible = true
else: else:
if upgrades.visible == false: if upgrades.visible == false:
upgrades.visible = true upgrades.visible = true
else: else:
upgrades.visible = false upgrades.visible = false
func _on_choc_pressed():
if vanUp.visible == true: func _on_honest_pressed():
vanUp.visible = false if honUp.visible == false:
chocUp.visible = true for child in allUp:
child.visible = false
honUp.visible = true
else:
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
func _on_nightmare_pressed():
if nightUp.visible == false:
for child in allUp:
child.visible = false
nightUp.visible = true
else: else:
if upgrades.visible == false: if upgrades.visible == false:
upgrades.visible = true upgrades.visible = true

@ -24,40 +24,122 @@ signal unlockCin()
signal oneMoreCupcake5() signal oneMoreCupcake5()
signal fasterCupcake5() signal fasterCupcake5()
signal condensedCupcake5() signal condensedCupcake5()
signal unlockHon()
#Honest
signal oneMoreCupcake6()
signal fasterCupcake6()
signal condensedCupcake6()
signal horseHealth()
signal cupcakeDamage()
signal sweetieDamage()
#Nightmare #Nightmare
signal unlockNightmare() signal unlockNightmare()
func _on_close_pressed(): func _on_close_pressed():
self.visible = false self.visible = false
func _on_buy_pressed(): func _on_buy_pressed():
emit_signal("oneMoreCupcake") emit_signal("oneMoreCupcake")
func _on_buy_van2_pressed(): func _on_buy_van2_pressed():
emit_signal("fasterCupcake") emit_signal("fasterCupcake")
func _on_buy_van3_pressed(): func _on_buy_van3_pressed():
emit_signal("condensedCupcake1") emit_signal("condensedCupcake1")
func _on_buy_van4_pressed(): func _on_buy_van4_pressed():
emit_signal("unlockChoc") emit_signal("unlockChoc")
func _on_buy_choc1_pressed(): func _on_buy_choc1_pressed():
emit_signal("oneMoreCupcake2") emit_signal("oneMoreCupcake2")
func _on_buy_choc2_pressed(): func _on_buy_choc2_pressed():
emit_signal("fasterCupcake2") emit_signal("fasterCupcake2")
func _on_buy_choc3_pressed(): func _on_buy_choc3_pressed():
emit_signal("condensedCupcake2") emit_signal("condensedCupcake2")
func _on_buy_choc4_pressed(): func _on_buy_choc4_pressed():
emit_signal("unlockStraw") emit_signal("unlockStraw")
func _on_buy_straw1_pressed():
emit_signal("oneMoreCupcake3")
func _on_buy_straw2_pressed():
emit_signal("fasterCupcake3")
func _on_buy_straw3_pressed():
emit_signal("condensedCupcake3")
func _on_buy_straw4_pressed():
emit_signal("unlockRVel")
func _on_buy_rvel1_pressed():
emit_signal("oneMoreCupcake4")
func _on_buy_rvel2_pressed():
emit_signal("fasterCupcake4")
func _on_buy_rvel3_pressed():
emit_signal("condensedCupcake4")
func _on_buy_rvel4_pressed():
emit_signal("unlockCin")
func _on_buy_cin1_pressed():
emit_signal("oneMoreCupcake5")
func _on_buy_cin2_pressed():
emit_signal("fasterCupcake5")
func _on_buy_cin3_pressed():
emit_signal("condensedCupcake5")
func _on_buy_cin4_pressed():
emit_signal("unlockHon")
func _on_buy_hon1_pressed():
emit_signal("oneMoreCupcake6")
func _on_buy_hon2_pressed():
emit_signal("fasterCupcake6")
func _on_buy_hon3_pressed():
emit_signal("condensedCupcake6")
func _on_buy_hon4_pressed():
emit_signal("unlockNightmare")
func _on_buy_night1_pressed():
pass
func _on_buy_night2_pressed():
pass
func _on_buy_night3_pressed():
pass
func _on_buy_night4_pressed():
pass

Loading…
Cancel
Save