OnlyMareGames
/
CupcakeRevolution
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Nightly Push

Browse Source 
-added two new types of cupcake
-cleaned up and organized a lot of code
-paved way for a lot of future expansion
-new cupcake art
main
OnlyMares 2 years ago
parent a9a5a4161a
commit 6aea376ad3
33 changed files with 801 additions and 228 deletions
Show Stats Download Patch File Download Diff File

11
.godot/editor/create_recent.Node
Unescape Escape View File

@ -1,11 +1,13 @@
Button
GridContainer
TextureRect
Label
ScrollContainer
RichTextLabel
Control
Container
HBoxContainer
TextureRect
Sprite2D
Label
Button
GridContainer
ItemList
VScrollBar
VBoxContainer
@ -15,7 +17,6 @@ CollisionPolygon2D
Node2D
Area2D
CanvasLayer
ScrollContainer
AnimationPlayer
TextureButton
Timer

4
.godot/editor/cupcake.tscn-editstate-c7065fd652f87712eb190c1157c23200.cfg
Unescape Escape View File

@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
"ofs": Vector2(-1354.04, -771.218),
"ofs": Vector2(-350.251, -204.433),
"primary_grid_steps": 8,
"show_edit_locks": true,
"show_guides": true,
@ -32,7 +32,7 @@ Anim={
"snap_rotation_step": 0.261799,
"snap_scale": false,
"snap_scale_step": 0.1,
"zoom": 0.890899
"zoom": 3.1748
}
3D={
"fov": 70.01,

6
.godot/editor/editor_layout.cfg
Unescape Escape View File

@ -14,15 +14,15 @@ dock_split_1=0
dock_split_4=0
dock_2="FileSystem"
dock_3="Scene,Import"
dock_5="Inspector,Node,History,Commit (3)"
dock_5="Inspector,Node,History,Commit (33)"
[EditorNode]
open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn"]
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"]
[ScriptEditor]
open_scripts=["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/upgrades.gd", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd"]
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_help=["Node"]
script_split_offset=70
list_split_offset=0

51
.godot/editor/filesystem_cache8
Unescape Escape View File

@ -1,6 +1,6 @@
2a60927148abd1d33b818b535e306557
::res://::1678090313
export_presets.cfg::TextFile::-1::1678010409::0::1::::<><>::
::res://::1678098956
export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>::
README.md::TextFile::-1::1677829846::0::1::::<><>::
::res://addons/::1677750379
::res://addons/godot-git-plugin/::1677750379
@ -13,28 +13,43 @@ THIRDPARTY.md::TextFile::-1::1677750379::0::1::::<><>::
::res://Art/::1677787260
::res://Art/Characters/::1677787257
defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>::
::res://Art/Cupcakes/::1677787255
::res://Art/Cupcakes/::1678176993
ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>::
Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>::
VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>::
::res://Art/Locations/::1677787260
yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>::
::res://Art/Upgrades/::1677787246
::res://Scenes/::1678090225
game_world.tscn::PackedScene::7981802964863433317::1678090225::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q
horse.tscn::PackedScene::8568825373134700876::1678090225::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke
::res://Scenes/Cupcakes/::1678090225
cupcake.tscn::PackedScene::8468695979515826288::1678090225::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k
::res://Scenes/Locations/::1678090225
yard.tscn::PackedScene::7883941411178408831::1678090225::0::1::::<><>::uid://b3j662tj6h5vq
::res://Scenes/UI/::1678090225
ingame_ui.tscn::PackedScene::6815695514927101566::1678090225::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k
upgrades.tscn::PackedScene::5871013436024621816::1678090225::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k
::res://Scripts/::1678090225
::res://Releases/::1678095890
::res://Releases/Linux/::1678096050
::res://Releases/Linux/v0 Version Zero/::1678095971
::res://Releases/Linux/v0.1 Pre-Alpha/::1678096011
::res://Releases/Web/::1678096071
::res://Releases/Web/v0 Version Zero/::1678098957
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/v0 Version Zero/::1678096086
::res://Scenes/::1678176168
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
horse.tscn::PackedScene::8568825373134700876::1678176168::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke
::res://Scenes/Cupcakes/::1678176420
chocCupcake.tscn::PackedScene::5843790513687768897::1678176420::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k
cupcake.tscn::PackedScene::8468695979515826288::1678176168::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k
strawCupcake.tscn::PackedScene::3124004694192797727::1678177096::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k
::res://Scenes/Locations/::1678176168
yard.tscn::PackedScene::7883941411178408831::1678176168::0::1::::<><>::uid://b3j662tj6h5vq
::res://Scenes/UI/::1678176168
ingame_ui.tscn::PackedScene::6815695514927101566::1678176168::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k
upgrades.tscn::PackedScene::5871013436024621816::1678176168::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k
::res://Scripts/::1678176067
Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>::
game_world.gd::GDScript::-1::1678090225::0::1::::<>Node2D<>::
horse.gd::GDScript::-1::1678073658::0::1::::<>CharacterBody2D<>::
ingame_ui.gd::GDScript::-1::1678059546::0::1::::<>CanvasLayer<>::
game_world.gd::GDScript::-1::1678176067::0::1::::<>Node2D<>::
horse.gd::GDScript::-1::1678175992::0::1::::<>CharacterBody2D<>::
ingame_ui.gd::GDScript::-1::1678173250::0::1::::<>CanvasLayer<>::
PlayArea.gd::GDScript::-1::1678064613::0::1::::<>Area2D<>::
upgrades.gd::GDScript::-1::1678074136::0::1::::<>CanvasLayer<>::
upgrades.gd::GDScript::-1::1678175992::0::1::::<>CanvasLayer<>::
varConst.gd::GDScript::-1::1677895026::0::1::::<>Node<>::
varVar.gd::GDScript::-1::1678066992::0::1::::<>Node<>::
::res://Scripts/Cupcakes/::1678073658

12
.godot/editor/filesystem_update4
Unescape Escape View File

@ -1,7 +1,15 @@
res://Scenes/game_world.tscn
res://Scenes/UI/upgrades.tscn
res://Scripts/game_world.gd
res://Scripts/ingame_ui.gd
res://Scenes/game_world.tscn
res://Scenes/horse.tscn
res://Scenes/Cupcakes/cupcake.tscn
res://Scenes/Locations/yard.tscn
res://Scenes/UI/upgrades.tscn
res://Scenes/UI/ingame_ui.tscn
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

4
.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg
Unescape Escape View File

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

2
.godot/editor/game_world.tscn-folding-bdbf2ba254a2078c85b005689e1549ff.cfg
Unescape Escape View File

@ -1,5 +1,5 @@
[folding]
node_unfolds=[NodePath("."), PackedStringArray("Transform", "Material", "Texture", "Ordering", "Visibility", "Editor Description", "Process", "ccVanilla"), NodePath("Location"), PackedStringArray("Visibility"), NodePath("Upgrades"), PackedStringArray("Layer"), NodePath("Cupcakes/Cupcake"), PackedStringArray("Collision"), NodePath("PlayArea"), PackedStringArray("Input", "Collision", "Visibility"), NodePath("PlayArea/CollisionShape2D"), PackedStringArray("Transform", "shape")]
node_unfolds=[NodePath("."), PackedStringArray("Transform", "Material", "Texture", "Ordering", "Visibility", "Editor Description", "Process", "ccVanilla"), NodePath("Location"), PackedStringArray("Visibility"), NodePath("Upgrades"), PackedStringArray("Layer"), NodePath("PlayArea"), PackedStringArray("Input", "Collision", "Visibility"), NodePath("PlayArea/CollisionShape2D"), PackedStringArray("Transform", "shape")]
resource_unfolds=["res://Scenes/game_world.tscn::RectangleShape2D_g5fj2", PackedStringArray()]
nodes_folded=[]

4
.godot/editor/project_metadata.cfg
Unescape Escape View File

@ -21,8 +21,8 @@ recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.092
[recent_files]
scenes=["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", "res://Scenes/Locations/Yard.tscn", "res://Scenes/cupcake.tscn"]
scripts=["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", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/game_world.gd"]
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"]
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"]
[script_setup]

2
.godot/editor/recent_dirs
Unescape Escape View File

@ -1,3 +1,4 @@
res://Scripts/Cupcakes
/home/shobie/CupcakeRevolution1/Linux
/bin
/home/shobie/CupcakeRevolution1
@ -7,7 +8,6 @@ res://Scenes/UI
res://Scripts
res://Scenes/Locations
res://Art/Locations
res://Scripts/Cupcakes
res://Art
res://Scenes
res://

46
.godot/editor/script_editor_cache.cfg
Unescape Escape View File

@ -3,10 +3,10 @@
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 21,
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 17,
"row": 3,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
@ -20,8 +20,8 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 113,
"scroll_position": 0.0,
"row": 128,
"scroll_position": 173.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@ -45,16 +45,12 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"column": 74,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 7,
"row": 5,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 7,
"selection_to_column": 15,
"selection_to_line": 7,
"selection": false,
"syntax_highlighter": "GDScript"
}
@ -94,13 +90,9 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 21,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 21,
"selection_to_column": 28,
"selection_to_line": 22,
"row": 31,
"scroll_position": 13.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@ -109,7 +101,7 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 10,
"column": 2,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 24,
@ -118,7 +110,7 @@ state={
"syntax_highlighter": "GDScript"
}
[res://Scripts/varVar.gd]
[res://Scripts/Cupcakes/chocCupcake.gd]
state={
"bookmarks": PackedInt32Array(),
@ -126,25 +118,21 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 4,
"row": 9,
"scroll_position": 0.0,
"selection": true,
"selection_from_column": 0,
"selection_from_line": 4,
"selection_to_column": 17,
"selection_to_line": 5,
"selection": false,
"syntax_highlighter": "GDScript"
}
[res://Scripts/varConst.gd]
[res://Scripts/Cupcakes/strawCupcake.gd]
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"column": 76,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 0,
"row": 5,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"

BIN
.godot/uid_cache.bin
View File

Binary file not shown.

BIN
Art/Cupcakes/ChocCupcake.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 990 B

34
Art/Cupcakes/ChocCupcake.png.import
Unescape Escape View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bnr06vojcqkqy"
path="res://.godot/imported/ChocCupcake.png-e006e5de377232b1b1c50df2e20e22a7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Art/Cupcakes/ChocCupcake.png"
dest_files=["res://.godot/imported/ChocCupcake.png-e006e5de377232b1b1c50df2e20e22a7.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

BIN
Art/Cupcakes/VanCupcake.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

34
Art/Cupcakes/VanCupcake.png.import
Unescape Escape View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://brpc5ocwgd8ls"
path="res://.godot/imported/VanCupcake.png-d7516ec98435c601fdd7cc0a7cd52e5e.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Art/Cupcakes/VanCupcake.png"
dest_files=["res://.godot/imported/VanCupcake.png-d7516ec98435c601fdd7cc0a7cd52e5e.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

34
Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.apple-touch-icon.png.import
Unescape Escape View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dym7wimtdio3t"
path="res://.godot/imported/CupcakeRevolutionVersionZero-Web.apple-touch-icon.png-6587dc09aaced088190c0b48d084655c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.apple-touch-icon.png"
dest_files=["res://.godot/imported/CupcakeRevolutionVersionZero-Web.apple-touch-icon.png-6587dc09aaced088190c0b48d084655c.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

34
Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.icon.png.import
Unescape Escape View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://no60x3x0tmim"
path="res://.godot/imported/CupcakeRevolutionVersionZero-Web.icon.png-0cefd14653d11abc9f16fc983737e553.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.icon.png"
dest_files=["res://.godot/imported/CupcakeRevolutionVersionZero-Web.icon.png-0cefd14653d11abc9f16fc983737e553.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

34
Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.png.import
Unescape Escape View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cr7virm84uv7f"
path="res://.godot/imported/CupcakeRevolutionVersionZero-Web.png-4edd3d8a0459ba43f693cf3a5ff31210.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.png"
dest_files=["res://.godot/imported/CupcakeRevolutionVersionZero-Web.png-4edd3d8a0459ba43f693cf3a5ff31210.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

26
Scenes/Cupcakes/chocCupcake.tscn
Unescape Escape View File

@ -0,0 +1,26 @@
[gd_scene load_steps=4 format=3 uid="uid://cpi1m1vg4lscn"]
[ext_resource type="Script" path="res://Scripts/Cupcakes/chocCupcake.gd" id="1_fnewv"]
[ext_resource type="Texture2D" uid="uid://bnr06vojcqkqy" path="res://Art/Cupcakes/ChocCupcake.png" id="2_i5efq"]
[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"]
radius = 10.5119
[node name="ChocCupcake" type="RigidBody2D"]
collision_layer = 2
inertia = 0.17
gravity_scale = 0.0
linear_damp = 6.0
script = ExtResource("1_fnewv")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture_filter = 1
position = Vector2(0, -1.288)
scale = Vector2(1.5, 1.5)
texture = ExtResource("2_i5efq")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(2, 2)
shape = SubResource("CircleShape2D_svirt")
[connection signal="body_exited" from="." to="." method="_on_body_exited"]

13
Scenes/Cupcakes/cupcake.tscn
Unescape Escape View File

@ -1,13 +1,12 @@
[gd_scene load_steps=4 format=3 uid="uid://dswkgkor3yejo"]
[ext_resource type="Script" path="res://Scripts/Cupcakes/cupcake.gd" id="1_2fcqt"]
[ext_resource type="Texture2D" uid="uid://7fqro4fugv8k" path="res://Art/Cupcakes/Cupcake.png" id="1_632he"]
[ext_resource type="Texture2D" uid="uid://brpc5ocwgd8ls" path="res://Art/Cupcakes/VanCupcake.png" id="2_crmpu"]
[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"]
radius = 16.0
radius = 10.5119
[node name="Cupcake" type="RigidBody2D"]
scale = Vector2(0.7, 0.7)
[node name="VanCupcake" type="RigidBody2D"]
collision_layer = 2
inertia = 0.17
gravity_scale = 0.0
@ -16,9 +15,9 @@ script = ExtResource("1_2fcqt")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture_filter = 1
position = Vector2(0, -4)
scale = Vector2(2, 2)
texture = ExtResource("1_632he")
position = Vector2(0, -1.288)
scale = Vector2(1.5, 1.5)
texture = ExtResource("2_crmpu")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(2, 2)

26
Scenes/Cupcakes/strawCupcake.tscn
Unescape Escape View File

@ -0,0 +1,26 @@
[gd_scene load_steps=4 format=3 uid="uid://bkrj5vouqpo8n"]
[ext_resource type="Script" path="res://Scripts/Cupcakes/strawCupcake.gd" id="1_qw0j6"]
[ext_resource type="Texture2D" uid="uid://7fqro4fugv8k" path="res://Art/Cupcakes/Cupcake.png" id="2_21f8h"]
[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"]
radius = 10.5119
[node name="StrawCupcake" type="RigidBody2D"]
collision_layer = 2
inertia = 0.17
gravity_scale = 0.0
linear_damp = 6.0
script = ExtResource("1_qw0j6")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture_filter = 1
position = Vector2(0, -1.288)
scale = Vector2(1.5, 1.5)
texture = ExtResource("2_21f8h")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
scale = Vector2(2, 2)
shape = SubResource("CircleShape2D_svirt")
[connection signal="body_exited" from="." to="." method="_on_body_exited"]

79
Scenes/UI/ingame_ui.tscn
Unescape Escape View File

@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=3 uid="uid://c4dtrk2kooa6q"]
[gd_scene load_steps=5 format=3 uid="uid://c4dtrk2kooa6q"]
[ext_resource type="Script" path="res://Scripts/ingame_ui.gd" id="1_q8tnv"]
[ext_resource type="Texture2D" uid="uid://7fqro4fugv8k" path="res://Art/Cupcakes/Cupcake.png" id="1_vkoxt"]
[ext_resource type="Texture2D" uid="uid://brpc5ocwgd8ls" path="res://Art/Cupcakes/VanCupcake.png" id="2_65fff"]
[ext_resource type="Texture2D" uid="uid://bnr06vojcqkqy" path="res://Art/Cupcakes/ChocCupcake.png" id="3_xle4l"]
[node name="InGameUI" type="CanvasLayer"]
script = ExtResource("1_q8tnv")
@ -23,12 +25,18 @@ grow_vertical = 2
[node name="Van" type="Button" parent="Main/HBoxContainer"]
layout_mode = 2
icon = ExtResource("1_vkoxt")
icon = ExtResource("2_65fff")
icon_alignment = 1
[node name="Choc" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
icon = ExtResource("3_xle4l")
[node name="Straw" type="Button" parent="Main/HBoxContainer"]
visible = false
layout_mode = 2
text = "Choc"
icon = ExtResource("1_vkoxt")
[node name="Num" type="Control" parent="."]
layout_mode = 3
@ -38,6 +46,61 @@ offset_top = 15.0
offset_right = 239.0
offset_bottom = 985.0
[node name="GridContainer" type="GridContainer" parent="Num"]
layout_mode = 0
offset_left = -30.0
offset_right = 201.0
offset_bottom = 968.0
columns = 2
[node name="vanIcon" type="TextureRect" parent="Num/GridContainer"]
layout_mode = 2
texture = ExtResource("2_65fff")
stretch_mode = 5
[node name="ccVanNum" type="RichTextLabel" parent="Num/GridContainer"]
custom_minimum_size = Vector2(256, 0)
layout_mode = 2
text = "0"
fit_content = true
[node name="chocIcon" type="TextureRect" parent="Num/GridContainer"]
visible = false
layout_mode = 2
texture = ExtResource("3_xle4l")
stretch_mode = 5
[node name="ccChocNum" type="RichTextLabel" parent="Num/GridContainer"]
visible = false
layout_mode = 2
text = "0"
fit_content = true
[node name="strawIcon" type="TextureRect" parent="Num/GridContainer"]
visible = false
layout_mode = 2
texture = ExtResource("1_vkoxt")
stretch_mode = 5
[node name="ccStrawNum" type="RichTextLabel" parent="Num/GridContainer"]
visible = false
custom_minimum_size = Vector2(256, 0)
layout_mode = 2
text = "0"
fit_content = true
[node name="redVelvetIcon" type="TextureRect" parent="Num/GridContainer"]
visible = false
layout_mode = 2
texture = ExtResource("3_xle4l")
stretch_mode = 5
[node name="ccRVelvetNum" type="RichTextLabel" parent="Num/GridContainer"]
visible = false
layout_mode = 2
text = "0"
fit_content = true
[node name="VBoxContainer" type="VBoxContainer" parent="Num"]
layout_mode = 2
anchor_right = 1.0
@ -45,10 +108,6 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="ccVanNum" type="Label" parent="Num/VBoxContainer"]
layout_mode = 2
text = "0"
[node name="Icons" type="Control" parent="."]
clip_children = 1
layout_mode = 3
@ -65,11 +124,5 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="ccVanIcon" type="Sprite2D" parent="Icons/VBoxContainer"]
position = Vector2(11, 0)
scale = Vector2(0.874, 0.874)
texture = ExtResource("1_vkoxt")
centered = false
[connection signal="pressed" from="Main/HBoxContainer/Van" to="." method="_on_van_pressed"]
[connection signal="pressed" from="Main/HBoxContainer/Choc" to="." method="_on_choc_pressed"]

208
Scenes/UI/upgrades.tscn
Unescape Escape View File

@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=3 uid="uid://cpv7y67qtmino"]
[gd_scene load_steps=5 format=3 uid="uid://cpv7y67qtmino"]
[ext_resource type="Script" path="res://Scripts/upgrades.gd" id="1_ofi8s"]
[ext_resource type="Texture2D" uid="uid://7fqro4fugv8k" path="res://Art/Cupcakes/Cupcake.png" id="2_c66ch"]
[ext_resource type="Texture2D" uid="uid://brpc5ocwgd8ls" path="res://Art/Cupcakes/VanCupcake.png" id="2_ydoya"]
[ext_resource type="Texture2D" uid="uid://bnr06vojcqkqy" path="res://Art/Cupcakes/ChocCupcake.png" id="3_c5nuv"]
[node name="Upgrades" type="CanvasLayer"]
script = ExtResource("1_ofi8s")
@ -46,8 +48,10 @@ offset_left = -787.0
offset_top = -380.0
offset_right = 794.0
offset_bottom = 379.0
grow_horizontal = 2
grow_vertical = 2
[node name="ScrollContainer" type="ScrollContainer" parent="Control"]
[node name="VanScroll" type="ScrollContainer" parent="Control"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
@ -56,93 +60,223 @@ grow_horizontal = 2
grow_vertical = 2
vertical_scroll_mode = 2
[node name="VanGrid" type="GridContainer" parent="Control/ScrollContainer"]
custom_minimum_size = Vector2(64, 64)
[node name="VanGrid" type="GridContainer" parent="Control/VanScroll"]
custom_minimum_size = Vector2(256, 256)
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="VanUp1" type="HBoxContainer" parent="Control/ScrollContainer/VanGrid"]
[node name="VanLabel" type="Label" parent="Control/VanScroll/VanGrid"]
layout_mode = 2
text = "Vanilla Cupcake Upgrades"
[node name="TextureRect" type="TextureRect" parent="Control/ScrollContainer/VanGrid/VanUp1"]
[node name="VanUp1" type="HBoxContainer" parent="Control/VanScroll/VanGrid"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp1"]
[node name="TextureRect" type="TextureRect" parent="Control/VanScroll/VanGrid/VanUp1"]
layout_mode = 2
texture = ExtResource("2_ydoya")
[node name="Name" type="Label" parent="Control/VanScroll/VanGrid/VanUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp1"]
[node name="Desc" type="Label" parent="Control/VanScroll/VanGrid/VanUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp1"]
[node name="Price" type="Label" parent="Control/VanScroll/VanGrid/VanUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/ScrollContainer/VanGrid/VanUp1"]
[node name="Buy" type="Button" parent="Control/VanScroll/VanGrid/VanUp1"]
layout_mode = 2
text = "Buy"
[node name="VanUp2" type="HBoxContainer" parent="Control/ScrollContainer/VanGrid"]
[node name="VanUp2" type="HBoxContainer" parent="Control/VanScroll/VanGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/ScrollContainer/VanGrid/VanUp2"]
[node name="TextureRect" type="TextureRect" parent="Control/VanScroll/VanGrid/VanUp2"]
layout_mode = 2
texture = ExtResource("2_c66ch")
texture = ExtResource("2_ydoya")
[node name="Name" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp2"]
[node name="Name" type="Label" parent="Control/VanScroll/VanGrid/VanUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp2"]
[node name="Desc" type="Label" parent="Control/VanScroll/VanGrid/VanUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp2"]
[node name="Price" type="Label" parent="Control/VanScroll/VanGrid/VanUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/ScrollContainer/VanGrid/VanUp2"]
[node name="Buy" type="Button" parent="Control/VanScroll/VanGrid/VanUp2"]
layout_mode = 2
text = "Buy"
[node name="VanUp3" type="HBoxContainer" parent="Control/ScrollContainer/VanGrid"]
[node name="VanUp3" type="HBoxContainer" parent="Control/VanScroll/VanGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/ScrollContainer/VanGrid/VanUp3"]
[node name="TextureRect" type="TextureRect" parent="Control/VanScroll/VanGrid/VanUp3"]
layout_mode = 2
texture = ExtResource("2_c66ch")
texture = ExtResource("2_ydoya")
[node name="Name" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp3"]
[node name="Name" type="Label" parent="Control/VanScroll/VanGrid/VanUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp3"]
[node name="Desc" type="Label" parent="Control/VanScroll/VanGrid/VanUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/ScrollContainer/VanGrid/VanUp3"]
[node name="Price" type="Label" parent="Control/VanScroll/VanGrid/VanUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/ScrollContainer/VanGrid/VanUp3"]
[node name="Buy" type="Button" parent="Control/VanScroll/VanGrid/VanUp3"]
layout_mode = 2
text = "Buy"
[node name="VScrollBar" type="VScrollBar" parent="Control"]
[node name="VanUp4" type="HBoxContainer" parent="Control/VanScroll/VanGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/VanScroll/VanGrid/VanUp4"]
layout_mode = 2
texture = ExtResource("3_c5nuv")
[node name="Name" type="Label" parent="Control/VanScroll/VanGrid/VanUp4"]
layout_mode = 2
text = "Chocolate Cupcakes"
[node name="Desc" type="Label" parent="Control/VanScroll/VanGrid/VanUp4"]
layout_mode = 2
text = "Unlock Chocolate Cupcakes"
[node name="Price" type="Label" parent="Control/VanScroll/VanGrid/VanUp4"]
layout_mode = 2
text = "25000"
[node name="Buy" type="Button" parent="Control/VanScroll/VanGrid/VanUp4"]
layout_mode = 2
text = "Buy"
[node name="ChocScroll" 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="ChocGrid" type="GridContainer" parent="Control/ChocScroll"]
layout_mode = 2
size_flags_horizontal = 3
[node name="ChocLabel" type="Label" parent="Control/ChocScroll/ChocGrid"]
layout_mode = 2
text = "Chocolate Cupcake Upgrades"
[node name="ChocUp1" type="HBoxContainer" parent="Control/ChocScroll/ChocGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/ChocScroll/ChocGrid/ChocUp1"]
layout_mode = 2
texture = ExtResource("3_c5nuv")
[node name="Name" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp1"]
layout_mode = 2
text = "More Cupcakes"
[node name="Desc" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp1"]
layout_mode = 2
text = "+1 cupcake per drop"
[node name="Price" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp1"]
layout_mode = 2
text = "10"
[node name="Buy" type="Button" parent="Control/ChocScroll/ChocGrid/ChocUp1"]
layout_mode = 2
text = "Buy"
[node name="ChocUp2" type="HBoxContainer" parent="Control/ChocScroll/ChocGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/ChocScroll/ChocGrid/ChocUp2"]
layout_mode = 2
texture = ExtResource("3_c5nuv")
[node name="Name" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp2"]
layout_mode = 2
text = "Faster Cupcakes"
[node name="Desc" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp2"]
layout_mode = 2
text = "+1% faster cupcake droprate"
[node name="Price" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp2"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/ChocScroll/ChocGrid/ChocUp2"]
layout_mode = 2
text = "Buy"
[node name="ChocUp3" type="HBoxContainer" parent="Control/ChocScroll/ChocGrid"]
layout_mode = 2
[node name="TextureRect" type="TextureRect" parent="Control/ChocScroll/ChocGrid/ChocUp3"]
layout_mode = 2
texture = ExtResource("3_c5nuv")
[node name="Name" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp3"]
layout_mode = 2
text = "Condensed Cupcakes"
[node name="Desc" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp3"]
layout_mode = 2
text = "+1 cupcake for every cupcake collected"
[node name="Price" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp3"]
layout_mode = 2
text = "15"
[node name="Buy" type="Button" parent="Control/ChocScroll/ChocGrid/ChocUp3"]
layout_mode = 2
text = "Buy"
[node name="ChocUp4" type="HBoxContainer" parent="Control/ChocScroll/ChocGrid"]
layout_mode = 2
anchor_left = 1.0
anchor_top = 0.033
anchor_right = 1.021
anchor_bottom = 0.989
offset_left = 8.0
offset_top = -0.046999
offset_right = -0.20105
offset_bottom = 0.348999
[node name="TextureRect" type="TextureRect" parent="Control/ChocScroll/ChocGrid/ChocUp4"]
layout_mode = 2
texture = ExtResource("2_c66ch")
[node name="Name" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp4"]
layout_mode = 2
text = "Strawberry Cupcakes"
[node name="Desc" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp4"]
layout_mode = 2
text = "Unlock Strawberry Cupcakes"
[node name="Price" type="Label" parent="Control/ChocScroll/ChocGrid/ChocUp4"]
layout_mode = 2
text = "50000"
[node name="Buy" type="Button" parent="Control/ChocScroll/ChocGrid/ChocUp4"]
layout_mode = 2
text = "Buy"
[connection signal="pressed" from="Close" to="." method="_on_close_pressed"]
[connection signal="pressed" from="Control/ScrollContainer/VanGrid/VanUp1/Buy" to="." method="_on_buy_pressed"]
[connection signal="pressed" from="Control/ScrollContainer/VanGrid/VanUp2/Buy" to="." method="_on_buy_van2_pressed"]
[connection signal="pressed" from="Control/ScrollContainer/VanGrid/VanUp3/Buy" to="." method="_on_buy_van3_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/VanUp3/Buy" to="." method="_on_buy_van3_pressed"]
[connection signal="pressed" from="Control/VanScroll/VanGrid/VanUp4/Buy" to="." method="_on_buy_van4_pressed"]
[connection signal="pressed" from="Control/ChocScroll/ChocGrid/ChocUp1/Buy" to="." method="_on_buy_choc1_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/ChocUp4/Buy" to="." method="_on_buy_choc4_pressed"]

25
Scenes/game_world.tscn
Unescape Escape View File

@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=3 uid="uid://dlypem0porccr"]
[gd_scene load_steps=10 format=3 uid="uid://dlypem0porccr"]
[ext_resource type="Script" path="res://Scripts/game_world.gd" id="1_c2sx0"]
[ext_resource type="Script" path="res://Scripts/Cupcake Spawn Timer.gd" id="2_bjylp"]
@ -6,6 +6,8 @@
[ext_resource type="PackedScene" uid="uid://cpv7y67qtmino" path="res://Scenes/UI/upgrades.tscn" id="2_vdy4r"]
[ext_resource type="Script" path="res://Scripts/PlayArea.gd" id="3_3x1i6"]
[ext_resource type="PackedScene" uid="uid://c4dtrk2kooa6q" path="res://Scenes/UI/ingame_ui.tscn" id="3_wm6l6"]
[ext_resource type="PackedScene" uid="uid://cpi1m1vg4lscn" path="res://Scenes/Cupcakes/chocCupcake.tscn" id="6_8pgeb"]
[ext_resource type="PackedScene" uid="uid://bkrj5vouqpo8n" path="res://Scenes/Cupcakes/strawCupcake.tscn" id="7_mcfjy"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_g5fj2"]
size = Vector2(1820, 986)
@ -27,8 +29,14 @@ script = ExtResource("2_bjylp")
[node name="Cupcakes" type="Node2D" parent="."]
[node name="Cupcake" parent="Cupcakes" instance=ExtResource("2_fi3r2")]
position = Vector2(283, -176)
[node name="VanCupcake" parent="Cupcakes" instance=ExtResource("2_fi3r2")]
position = Vector2(647, -65)
[node name="ChocCupcake" parent="Cupcakes" instance=ExtResource("6_8pgeb")]
position = Vector2(713, -69)
[node name="StrawCupcake" parent="Cupcakes" instance=ExtResource("7_mcfjy")]
position = Vector2(778, -60)
[node name="PlayArea" type="Area2D" parent="."]
light_mask = 3
@ -41,11 +49,14 @@ script = ExtResource("3_3x1i6")
position = Vector2(957, 539)
shape = SubResource("RectangleShape2D_g5fj2")
[connection signal="condensedCupcake1" from="." to="Cupcakes/Cupcake" method="_on_game_world_condensed_cupcake_1"]
[connection signal="condensedCupcake1" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_1"]
[connection signal="fasterCupcake" from="Upgrades" to="." method="_on_upgrades_faster_cupcake"]
[connection signal="oneMoreCupcake" from="Upgrades" to="." method="_on_upgrades_one_more_cupcake"]
[connection signal="unlockChoc" from="Upgrades" to="." method="_on_upgrades_unlock_choc"]
[connection signal="timeout" from="Cupcake Spawn Timer" to="." method="_on_timeout"]
[connection signal="ccVanCollected" from="Cupcakes/Cupcake" to="." method="_on_cupcake_cc_van_collected"]
[connection signal="body_exited" from="PlayArea" to="." method="_on_play_area_body_exited"]
[connection signal="body_exited" from="PlayArea" to="Cupcakes/Cupcake" method="_on_play_area_body_exited"]
[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="ccStrawCollected" from="Cupcakes/StrawCupcake" to="." method="_on_straw_cupcake_cc_straw_collected"]
[connection signal="body_exited" from="PlayArea" to="Cupcakes/VanCupcake" method="_on_play_area_body_exited"]
[connection signal="body_exited" from="PlayArea" to="Cupcakes/ChocCupcake" method="_on_play_area_body_exited"]
[connection signal="body_exited" from="PlayArea" to="Cupcakes/StrawCupcake" method="_on_play_area_body_exited"]

9
Scripts/Cupcakes/chocCupcake.gd
Unescape Escape View File

@ -0,0 +1,9 @@
extends RigidBody2D
signal ccChocCollected()
func _on_play_area_body_exited(body):
if body.get_parent() == $"../../Cupcakes" and body.name.find("Choc") != -1:
emit_signal("ccChocCollected")
body.queue_free()

23
Scripts/Cupcakes/cupcake.gd
Unescape Escape View File

@ -1,29 +1,8 @@
extends RigidBody2D
var speed = Vector2.ZERO
var horse = preload("res://Scripts/horse.gd")
@onready var playArea = $"../../PlayArea"
@onready var ccCol
var scorecard = preload("res://Scripts/varVar.gd")
var ccValue = 1
signal ccVanCollected()
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
pass
func _on_play_area_body_exited(body):
if body.get_parent() == $"../../Cupcakes":
if body.get_parent() == $"../../Cupcakes" and body.name.find("Van") != -1:
emit_signal("ccVanCollected")
body.queue_free()
func _on_game_world_condensed_cupcake_1():
ccValue += 1

9
Scripts/Cupcakes/strawCupcake.gd
Unescape Escape View File

@ -0,0 +1,9 @@
extends RigidBody2D
signal ccStrawCollected()
func _on_play_area_body_exited(body):
if body.get_parent() == $"../../Cupcakes" and body.name.find("Straw") != -1:
emit_signal("ccStrawCollected")
body.queue_free()

196
Scripts/game_world.gd
Unescape Escape View File

@ -1,17 +1,40 @@
extends Node2D
signal condensedCupcake1()
signal condensedCupcake2()
signal condensedCupcake3()
#Cupcake Values
var ccVanNum: int = 0
var ccVanValue: int = 1
var ccChocNum: int = 0
var ccChocValue: int = 1
var ccStrawNum: int = 0
var ccStrawValue: int = 1
var ccRVelNum: int = 0
var ccCRVelValue: int = 1
var ccCinNum: int = 0
var ccCinValue: int = 1
var ccNightmareNum: int = 0
var ccNightmareValue: int = 1
#Cupcake Upgrade Prices
var ccVanPrice: int = 10
var ccVanPrice2: int = 15
var ccVanPrice3: int = 15
var ccVanPrice4: int = 250
var ccChocPrice: int = 10
var ccChocPrice2: int
var ccChocPrice3: int
var ccChocPrice4: int
var ccChocPrice5: int
var ccChocPrice6: int
var ccStrawPrice: int
var ccStrawPrice2: int
var ccStrawPrice3: int
var ccStrawPrice4: int
var ccStrawPrice5: int
var ccStrawPrice6: int
#Preloaded scenes and scripts
var upgradeUI = preload("res://Scenes/UI/upgrades.tscn")
@ -19,80 +42,145 @@ var location = preload("res://Scenes/Locations/yard.tscn")
var horse_scene = preload("res://Scenes/horse.tscn")
var horse = preload("res://Scripts/horse.gd")
var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn")
var ccChocolate
var ccchoc
var ccChocolate = preload("res://Scenes/Cupcakes/chocCupcake.tscn")
var ccStrawberry = preload("res://Scenes/Cupcakes/strawCupcake.tscn")
var ccRedVelvet
var ccCinnamon
var ccNightmare
var ccRock
var ccRuby
var ccSapphire
var ccEmerald
var ccDiamond
var ccChaos
#Instantiations
var ccVan = ccVanilla.instantiate()
var ccChoc = ccChocolate.instantiate()
var ccStraw = ccStrawberry.instantiate()
var ccRVel
var ccNight
var ccRoc
var ccRub
var ccSap
var ccEme
var ccDia
var ccCha
#Cupcake Locks
var ccChocLocked = true
var ccStrawLocked = true
var ccRVelLocked = true
var ccCinLocked = true
var ccNightLocked = true
var ccRocLocked = true
var ccRubLocked = true
var ccSapLocked = true
var ccEmeLocked = true
var ccDiaLocked = true
var ccChaLocked = true
#Spawnrates
var ccVanSpawnRate = 60
var ccChocSpawnRate = 3
var ccStrawSpawnRate = 3
var ccRVelSpawnRate = 3
var ccNightSpawnRate = 3
var ccRocSpawnRate = 3
var ccRubSpawnRate = 3
var ccSapSpawnRate = 3
var ccEmeSpawnRate = 3
var ccDiaSpawnRate = 3
var ccChaSpawnRate = 3
#Other
@onready var timer = get_node("Cupcake Spawn Timer")
var horseAttached = true
var horse_instance
var mouse_position = Vector2.ZERO
var ccvan = ccVanilla.instantiate()
var ccSpawnRate = 3
var ccCount = 0
var ccMaxOnScreen = 2000
#General
func _ready():
var spawn
horse_instance = horse_scene.instantiate()
spawn = location.instantiate()
$Location.add_child(spawn)
add_child(horse_instance)
func _process(delta):
if horseAttached == true:
mouse_position = get_global_mouse_position()
horse_instance.position = mouse_position
handleInput()
func handleInput():
if Input.is_action_pressed("horseAttach"):
if horseAttached == true:
horseAttached = false
else:
horseAttached = true
func spawnCupcakes():
func collectCupcakes():
$InGameUI/Num/GridContainer/ccVanNum.text = str(ccVanNum)
$InGameUI/Num/GridContainer/ccChocNum.text = str(ccChocNum)
$InGameUI/Num/GridContainer/ccStrawNum.text = str(ccStrawNum)
func _on_timeout():
spawnVanCupcakes()
if ccChocLocked == false:
spawnChocCupcakes()
if ccStrawLocked == false:
spawnStrawCupcakes()
collectCupcakes()
timer.start
#Spawn
func spawnVanCupcakes():
var randX
var randY
randomize()
if ccCount <= ccMaxOnScreen:
for i in range(ccSpawnRate):
for i in range(ccVanSpawnRate):
randX = randi_range(10, 1910)
randY = randi_range(10, 1070)
ccvan.position = Vector2(randX, randY)
$Cupcakes.add_child(ccvan.duplicate())
ccCount = ccCount + ccSpawnRate
func collectCupcakes():
$InGameUI/Num/VBoxContainer/ccVanNum.text = str(ccVanNum)
ccVan.position = Vector2(randX, randY)
$Cupcakes.add_child(ccVan.duplicate())
ccCount = ccCount + ccVanSpawnRate
func _on_timeout():
spawnCupcakes()
collectCupcakes()
timer.start
func _on_play_area_body_exited(body):
pass
func _on_cupcake_cc_van_collected():
ccVanNum += ccVanValue
ccCount -= 1
collectCupcakes()
func spawnChocCupcakes():
var randX
var randY
randomize()
if ccCount <= ccMaxOnScreen:
for i in range(ccChocSpawnRate):
randX = randi_range(10, 1910)
randY = randi_range(10, 1070)
ccChoc.position = Vector2(randX, randY)
$Cupcakes.add_child(ccChoc.duplicate())
ccCount = ccCount + ccChocSpawnRate
func spawnStrawCupcakes():
var randX
var randY
randomize()
if ccCount <= ccMaxOnScreen:
for i in range(ccStrawSpawnRate):
randX = randi_range(10, 1910)
randY = randi_range(10, 1070)
ccStraw.position = Vector2(randX, randY)
$Cupcakes.add_child(ccStraw.duplicate())
ccCount = ccCount + ccStrawSpawnRate
#Upgrades
func _on_upgrades_one_more_cupcake():
if ccVanNum >= ccVanPrice:
ccSpawnRate += 1
ccVanSpawnRate += 1
ccVanNum -= ccVanPrice
ccVanPrice = ccVanPrice * 1.3
$Upgrades/Control/ScrollContainer/VanGrid/VanUp1/Price.text = str(ccVanPrice)
$Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice)
collectCupcakes()
@ -101,7 +189,7 @@ func _on_upgrades_faster_cupcake():
ccVanNum -= ccVanPrice2
ccVanPrice2 = ccVanPrice2 * 1.3
timer.wait_time = timer.wait_time - (timer.wait_time * 0.01)
$Upgrades/Control/ScrollContainer/VanGrid/VanUp2/Price.text = str(ccVanPrice2)
$Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2)
collectCupcakes()
func _on_upgrades_condensed_cupcake_1():
@ -109,5 +197,45 @@ func _on_upgrades_condensed_cupcake_1():
ccVanNum -= ccVanPrice3
ccVanPrice3 = ccVanPrice3 * 1.3
ccVanValue += 1
$Upgrades/Control/ScrollContainer/VanGrid/VanUp3/Price.text = str(ccVanPrice3)
$Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccVanPrice3)
collectCupcakes()
#Unlock
func _on_upgrades_unlock_choc():
if ccVanNum >= ccVanPrice4:
ccVanNum -= ccVanPrice4
ccChocLocked = false
$"InGameUI/Main/HBoxContainer/Choc".visible = true
$"InGameUI/Num/GridContainer/chocIcon".visible = true
$"InGameUI/Num/GridContainer/ccChocNum".visible = true
$"Upgrades/Control/VanScroll/VanGrid/VanUp4/Buy".visible = false
func _on_upgrades_unlock_straw():
if ccChocNum >= ccChocPrice4:
ccChocNum -= ccChocPrice4
ccStrawLocked = false
$"InGameUI/Main/HBoxContainer/Straw".visible = true
$"InGameUI/Num/GridContainer/strawIcon".visible = true
$"InGameUI/Num/GridContainer/ccStrawNum".visible = true
$"Upgrades/Control/ChocScroll/ChocGrid/ChocUp4/Buy".visible = false
#Collect
func _on_van_cupcake_cc_van_collected():
ccVanNum += ccVanValue
ccCount -= 1
collectCupcakes()
func _on_choc_cupcake_cc_choc_collected():
ccChocNum += ccChocValue
ccCount -= 1
collectCupcakes()
func _on_straw_cupcake_cc_straw_collected():
ccStrawNum += ccStrawValue
ccCount -= 1
collectCupcakes()

13
Scripts/horse.gd
Unescape Escape View File

@ -1,19 +1,8 @@
extends CharacterBody2D
var horse_instance
var mouse_position = Vector2.ZERO
var blower
#ccScore
var ccVanNum = 0
var ccChocNum = 0
var ccStrawNum = 0
var ccBlueNum = 0
var ccRVelNum = 0
signal hit
signal hit()
func _process(delta):
mouse_position = lerp(mouse_position, get_global_mouse_position(), 0.02)

22
Scripts/ingame_ui.gd
Unescape Escape View File

@ -1,6 +1,8 @@
extends CanvasLayer
@onready var upgrades = $"../Upgrades"
@onready var vanUp = $"../Upgrades/Control/VanScroll"
@onready var chocUp = $"../Upgrades/Control/ChocScroll"
# Called when the node enters the scene tree for the first time.
func _ready():
@ -13,13 +15,21 @@ func _process(delta):
func _on_van_pressed():
if upgrades.visible == false:
upgrades.visible = true
if vanUp.visible == false:
vanUp.visible = true
chocUp.visible = false
else:
upgrades.visible = false
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false
func _on_choc_pressed():
if upgrades.visible == false:
upgrades.visible = true
if vanUp.visible == true:
vanUp.visible = false
chocUp.visible = true
else:
upgrades.visible = false
if upgrades.visible == false:
upgrades.visible = true
else:
upgrades.visible = false

51
Scripts/upgrades.gd
Unescape Escape View File

@ -1,19 +1,34 @@
extends CanvasLayer
#Vanilla
signal oneMoreCupcake()
signal fasterCupcake()
signal condensedCupcake1()
func _ready():
pass # Replace with function body.
signal unlockChoc()
#Chocolate
signal oneMoreCupcake2()
signal fasterCupcake2()
signal condensedCupcake2()
signal unlockStraw()
#Strawberry
signal oneMoreCupcake3()
signal fasterCupcake3()
signal condensedCupcake3()
signal unlockRVel()
#Red Velvet
signal oneMoreCupcake4()
signal fasterCupcake4()
signal condensedCupcake4()
signal unlockCin()
#Cinnamon
signal oneMoreCupcake5()
signal fasterCupcake5()
signal condensedCupcake5()
#Nightmare
signal unlockNightmare()
func _on_close_pressed():
self.visible = false
func _on_buy_pressed():
@ -26,3 +41,23 @@ func _on_buy_van2_pressed():
func _on_buy_van3_pressed():
emit_signal("condensedCupcake1")
func _on_buy_van4_pressed():
emit_signal("unlockChoc")
func _on_buy_choc1_pressed():
emit_signal("oneMoreCupcake2")
func _on_buy_choc2_pressed():
emit_signal("fasterCupcake2")
func _on_buy_choc3_pressed():
emit_signal("condensedCupcake2")
func _on_buy_choc4_pressed():
emit_signal("unlockStraw")

11
Scripts/varConst.gd
Unescape Escape View File

@ -1,11 +0,0 @@
extends Node
# 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

6
Scripts/varVar.gd
Unescape Escape View File

@ -1,6 +0,0 @@
extends Node
var location
var ccVanNum = 0
var ccChocNum = 0
Write Preview
Loading…
Cancel
Save