diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 1583138..a8872ff 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,3 +1,7 @@ +RigidBody2D +CollisionShape2D +Sprite2D +Node2D Button GridContainer TextureRect @@ -7,20 +11,16 @@ RichTextLabel Control Container HBoxContainer -Sprite2D ItemList VScrollBar VBoxContainer Panel -CollisionShape2D CollisionPolygon2D -Node2D Area2D CanvasLayer AnimationPlayer TextureButton Timer -RigidBody2D Marker2D Camera2D CharacterBody2D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 98b1437..fb6fe08 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -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 (16)" +dock_5="Inspector,Node,History,Commit (40)" [EditorNode] -open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn"] +open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/Cupcakes/nightCupcake.tscn", "res://Scenes/Cupcakes/rvelCupcake.tscn", "res://Scenes/Cupcakes/cinCupcake.tscn", "res://Scenes/Cupcakes/honCupcake.tscn", "res://Scenes/Cupcakes/strawCupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Locations/neighYard.tscn", "res://Scenes/Tools/hooves.tscn"] [ScriptEditor] -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_scripts=["res://Scripts/Tools/bakingTray.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcakes/cinCupcake.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/Cupcakes/honCupcake.gd", "res://Scripts/Tools/hooves.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/Cupcakes/nightCupcake.gd", "res://README.md", "res://Scripts/Cupcakes/rvelCupcake.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"] open_help=["Node"] script_split_offset=70 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 86a0eb8..1c4691d 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -13,9 +13,13 @@ THIRDPARTY.md::TextFile::-1::1677750379::0::1::::<><>:: ::res://Art/::1677787260 ::res://Art/Characters/::1677787257 defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>:: -::res://Art/Cupcakes/::1678176997 +::res://Art/Cupcakes/::1678488712 ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>:: +CinCupcake.png::CompressedTexture2D::6767289867738545589::1678488310::1678488729::1::::<><>:: Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>:: +HonCupcake.png::CompressedTexture2D::7361236424952522838::1678488638::1678488729::1::::<><>:: +NightCupcake.png::CompressedTexture2D::1798860622294198324::1678488712::1678488729::1::::<><>:: +RVelCupcake.png::CompressedTexture2D::4611357256445777224::1678488250::1678488729::1::::<><>:: VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>:: ::res://Art/Locations/::1677787260 yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: @@ -28,8 +32,8 @@ yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1:: ::res://Releases/Web/v0 Version Zero/::1678185607 ::res://Releases/Windows/::1678096086 ::res://Releases/Windows/v0 Version Zero/::1678096086 -::res://Scenes/::1678400136 -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 +::res://Scenes/::1678487495 +game_world.tscn::PackedScene::7981802964863433317::1678487495::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::1678400136::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke ::res://Scenes/Cupcakes/::1678400136 chocCupcake.tscn::PackedScene::5843790513687768897::1678400136::0::1::::<><>::res://Scripts/Cupcakes/chocCupcake.gd<>uid://bnr06vojcqkqy @@ -37,16 +41,16 @@ cupcake.tscn::PackedScene::8468695979515826288::1678400136::0::1::::<><>::res:// strawCupcake.tscn::PackedScene::3124004694192797727::1678400136::0::1::::<><>::res://Scripts/Cupcakes/strawCupcake.gd<>uid://7fqro4fugv8k ::res://Scenes/Locations/::1678400136 yard.tscn::PackedScene::7883941411178408831::1678400136::0::1::::<><>::uid://b3j662tj6h5vq -::res://Scenes/UI/::1678400136 -ingame_ui.tscn::PackedScene::6815695514927101566::1678400136::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy -upgrades.tscn::PackedScene::5871013436024621816::1678400136::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy -::res://Scripts/::1678398331 +::res://Scenes/UI/::1678487495 +ingame_ui.tscn::PackedScene::6815695514927101566::1678487495::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy +upgrades.tscn::PackedScene::5871013436024621816::1678487495::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy +::res://Scripts/::1678487495 Cupcake Spawn Timer.gd::GDScript::-1::1678186507::0::1::::<>Timer<>:: -game_world.gd::GDScript::-1::1678400149::0::1::::<>Node2D<>:: +game_world.gd::GDScript::-1::1678487495::0::1::::<>Node2D<>:: horse.gd::GDScript::-1::1678184579::0::1::::<>CharacterBody2D<>:: -ingame_ui.gd::GDScript::-1::1678396600::0::1::::<>CanvasLayer<>:: +ingame_ui.gd::GDScript::-1::1678443815::0::1::::<>CanvasLayer<>:: PlayArea.gd::GDScript::-1::1678186507::0::1::::<>Area2D<>:: -upgrades.gd::GDScript::-1::1678397366::0::1::::<>CanvasLayer<>:: +upgrades.gd::GDScript::-1::1678443115::0::1::::<>CanvasLayer<>:: ::res://Scripts/Cupcakes/::1678180708 chocCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: cupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 5cf2a7b..2c399e2 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -4,3 +4,18 @@ res://Scenes/UI/upgrades.tscn res://Scenes/UI/ingame_ui.tscn res://Scripts/ingame_ui.gd res://Scripts/upgrades.gd +res://Scenes/Cupcakes/rvelCupcake.tscn +res://Scenes/Cupcakes/nightCupcake.tscn +res://Scenes/Cupcakes/cinCupcake.tscn +res://Scenes/Cupcakes/honCupcake.tscn +res://Scenes/Cupcakes/strawCupcake.tscn +res://Scripts/Cupcakes/rvelCupcake.gd +res://Scripts/Cupcakes/cinCupcake.gd +res://Scripts/horse.gd +res://Scenes/horse.tscn +res://Scenes/Tools/tool.tscn +res://Scenes/Locations/neighYard.tscn +res://Scenes/Tools/bakingTray.tscn +res://Scenes/Tools/hooves.tscn +res://Scripts/Tools/bakingTray.gd +res://Scripts/Tools/hooves.gd diff --git a/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg b/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg index c5434b4..dfaef07 100644 --- a/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg +++ b/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-63.727, -289.72), +"ofs": Vector2(-329.938, -390.646), "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.749154 +"zoom": 0.594604 } 3D={ "fov": 70.01, diff --git a/.godot/editor/horse.tscn-editstate-1d739c0c877f00d7b327b9018a2218eb.cfg b/.godot/editor/horse.tscn-editstate-1d739c0c877f00d7b327b9018a2218eb.cfg index ab9d979..85e6a03 100644 --- a/.godot/editor/horse.tscn-editstate-1d739c0c877f00d7b327b9018a2218eb.cfg +++ b/.godot/editor/horse.tscn-editstate-1d739c0c877f00d7b327b9018a2218eb.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-284.49, -150.315), +"ofs": Vector2(-543.061, -365.492), "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": 3.1748 +"zoom": 1.49831 } 3D={ "fov": 70.01, diff --git a/.godot/editor/horse.tscn-folding-1d739c0c877f00d7b327b9018a2218eb.cfg b/.godot/editor/horse.tscn-folding-1d739c0c877f00d7b327b9018a2218eb.cfg index 76b2725..c34508f 100644 --- a/.godot/editor/horse.tscn-folding-1d739c0c877f00d7b327b9018a2218eb.cfg +++ b/.godot/editor/horse.tscn-folding-1d739c0c877f00d7b327b9018a2218eb.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("texture", "Transform", "Texture"), NodePath("CollisionShape2D"), PackedStringArray("Texture", "Material")] +node_unfolds=[NodePath("."), PackedStringArray("Transform", "Visibility", "Collision"), NodePath("Sprite2D"), PackedStringArray("texture", "Transform", "Texture"), NodePath("CollisionShape2D"), PackedStringArray("Texture", "Material")] resource_unfolds=["res://Scenes/horse.tscn::CapsuleShape2D_gg7is", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 41055aa..c2ae31f 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -21,8 +21,8 @@ recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.092 [recent_files] -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/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"] +scenes=["res://Scenes/Tools/hooves.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Locations/neighYard.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Tools/tool.tscn", "res://Scenes/horse.tscn", "res://Scenes/Cupcakes/strawCupcake.tscn", "res://Scenes/Cupcakes/honCupcake.tscn", "res://Scenes/Cupcakes/cinCupcake.tscn", "res://Scenes/Cupcakes/rvelCupcake.tscn"] +scripts=["res://Scripts/Tools/hooves.gd", "res://Scripts/Tools/bakingTray.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/Cupcakes/nightCupcake.gd", "res://Scripts/Cupcakes/honCupcake.gd", "res://Scripts/Cupcakes/cinCupcake.gd", "res://Scripts/Cupcakes/rvelCupcake.gd", "res://Scripts/upgrades.gd", "res://Scripts/horse.gd", "res://Scripts/Cupcakes/chocCupcake.gd"] [script_setup] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 4639120..ef27cce 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,12 +1,15 @@ -/bin +res://Scripts/Tools +res://Scenes/Tools +res://Scenes/Locations res://Scripts/Cupcakes +res://Scenes/Cupcakes +/bin /home/shobie/CupcakeRevolution1/Linux /home/shobie/CupcakeRevolution1 /home/shobie/CupcakeRevolution1/Web /home/shobie/CupcakeRevolution1/Windows res://Scenes/UI res://Scripts -res://Scenes/Locations res://Art/Locations res://Art res://Scenes diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 3c9d34d..9daa631 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 24, -"folded_lines": Array[int]([]), +"column": 1, +"folded_lines": Array[int]([167, 174, 189, 199, 213, 225, 237, 249, 261, 283, 292, 301, 311, 320, 329, 339, 348, 356, 365, 373, 381, 390, 398, 406, 451, 460, 469, 478, 487, 496, 506, 511, 516, 521, 526]), "h_scroll_position": 0, -"row": 136, -"scroll_position": 188.0, +"row": 581, +"scroll_position": 120.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -45,10 +45,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 74, +"column": 37, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 5, +"row": 4, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -87,11 +87,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 6, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 126, -"scroll_position": 49.0, +"row": 116, +"scroll_position": 68.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -101,11 +101,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 8, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 85, -"scroll_position": 34.0, +"row": 111, +"scroll_position": 67.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -137,3 +137,87 @@ state={ "selection": false, "syntax_highlighter": "GDScript" } + +[res://Scripts/Cupcakes/rvelCupcake.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 1, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 5, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} + +[res://Scripts/Cupcakes/cinCupcake.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 1, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 5, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} + +[res://Scripts/Cupcakes/honCupcake.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 0, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 0, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} + +[res://Scripts/Cupcakes/nightCupcake.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 0, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 0, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} + +[res://Scripts/Tools/bakingTray.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 10, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 4, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} + +[res://Scripts/Tools/hooves.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 24, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 8, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index eebff36..70bc5a1 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/Art/Cupcakes/CinCupcake.png b/Art/Cupcakes/CinCupcake.png new file mode 100644 index 0000000..43da692 Binary files /dev/null and b/Art/Cupcakes/CinCupcake.png differ diff --git a/Art/Cupcakes/CinCupcake.png.import b/Art/Cupcakes/CinCupcake.png.import new file mode 100644 index 0000000..eb03eb1 --- /dev/null +++ b/Art/Cupcakes/CinCupcake.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c3oejmmv6ysxp" +path="res://.godot/imported/CinCupcake.png-ac660079f711cde122233d8ebd95be32.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Cupcakes/CinCupcake.png" +dest_files=["res://.godot/imported/CinCupcake.png-ac660079f711cde122233d8ebd95be32.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Art/Cupcakes/HonCupcake.png b/Art/Cupcakes/HonCupcake.png new file mode 100644 index 0000000..804f416 Binary files /dev/null and b/Art/Cupcakes/HonCupcake.png differ diff --git a/Art/Cupcakes/HonCupcake.png.import b/Art/Cupcakes/HonCupcake.png.import new file mode 100644 index 0000000..56580c5 --- /dev/null +++ b/Art/Cupcakes/HonCupcake.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dc43quvhcwa8e" +path="res://.godot/imported/HonCupcake.png-e8c1d179303f4f6136e7b365357e1728.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Cupcakes/HonCupcake.png" +dest_files=["res://.godot/imported/HonCupcake.png-e8c1d179303f4f6136e7b365357e1728.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Art/Cupcakes/NightCupcake.png b/Art/Cupcakes/NightCupcake.png new file mode 100644 index 0000000..a887cad Binary files /dev/null and b/Art/Cupcakes/NightCupcake.png differ diff --git a/Art/Cupcakes/NightCupcake.png.import b/Art/Cupcakes/NightCupcake.png.import new file mode 100644 index 0000000..aec2d11 --- /dev/null +++ b/Art/Cupcakes/NightCupcake.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://0vm8bhbkhqym" +path="res://.godot/imported/NightCupcake.png-ed5ddf07954b7673a4451f5be2d18bb6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Cupcakes/NightCupcake.png" +dest_files=["res://.godot/imported/NightCupcake.png-ed5ddf07954b7673a4451f5be2d18bb6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Art/Cupcakes/RVelCupcake.png b/Art/Cupcakes/RVelCupcake.png new file mode 100644 index 0000000..90275fc Binary files /dev/null and b/Art/Cupcakes/RVelCupcake.png differ diff --git a/Art/Cupcakes/RVelCupcake.png.import b/Art/Cupcakes/RVelCupcake.png.import new file mode 100644 index 0000000..3d4b367 --- /dev/null +++ b/Art/Cupcakes/RVelCupcake.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b6x1m6u01x377" +path="res://.godot/imported/RVelCupcake.png-14e105634f302b9899846f1e58357344.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Cupcakes/RVelCupcake.png" +dest_files=["res://.godot/imported/RVelCupcake.png-14e105634f302b9899846f1e58357344.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Scenes/Cupcakes/cinCupcake.tscn b/Scenes/Cupcakes/cinCupcake.tscn new file mode 100644 index 0000000..89e2c12 --- /dev/null +++ b/Scenes/Cupcakes/cinCupcake.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=4 format=3 uid="uid://c373r4pv46ydj"] + +[ext_resource type="Script" path="res://Scripts/Cupcakes/cinCupcake.gd" id="1_36k3s"] +[ext_resource type="Texture2D" uid="uid://c3oejmmv6ysxp" path="res://Art/Cupcakes/CinCupcake.png" id="2_7rk1h"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"] +radius = 10.5119 + +[node name="CinCupcake" type="RigidBody2D"] +collision_layer = 2 +inertia = 0.17 +gravity_scale = 0.0 +linear_damp = 6.0 +script = ExtResource("1_36k3s") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -1.288) +scale = Vector2(1.5, 1.5) +texture = ExtResource("2_7rk1h") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2(2, 2) +shape = SubResource("CircleShape2D_svirt") + +[connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/Scenes/Cupcakes/honCupcake.tscn b/Scenes/Cupcakes/honCupcake.tscn new file mode 100644 index 0000000..a5354e1 --- /dev/null +++ b/Scenes/Cupcakes/honCupcake.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=4 format=3 uid="uid://ciciat7jdjboy"] + +[ext_resource type="Script" path="res://Scripts/Cupcakes/honCupcake.gd" id="1_pnosq"] +[ext_resource type="Texture2D" uid="uid://dc43quvhcwa8e" path="res://Art/Cupcakes/HonCupcake.png" id="2_3t67h"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"] +radius = 10.5119 + +[node name="HonCupcake" type="RigidBody2D"] +collision_layer = 2 +inertia = 0.17 +gravity_scale = 0.0 +linear_damp = 6.0 +script = ExtResource("1_pnosq") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -1.288) +scale = Vector2(1.5, 1.5) +texture = ExtResource("2_3t67h") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2(2, 2) +shape = SubResource("CircleShape2D_svirt") + +[connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/Scenes/Cupcakes/nightCupcake.tscn b/Scenes/Cupcakes/nightCupcake.tscn new file mode 100644 index 0000000..915fbc6 --- /dev/null +++ b/Scenes/Cupcakes/nightCupcake.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=4 format=3 uid="uid://bptnammqx5dk2"] + +[ext_resource type="Script" path="res://Scripts/Cupcakes/nightCupcake.gd" id="1_o16jw"] +[ext_resource type="Texture2D" uid="uid://0vm8bhbkhqym" path="res://Art/Cupcakes/NightCupcake.png" id="2_otyy4"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"] +radius = 10.5119 + +[node name="NightCupcake" type="RigidBody2D"] +collision_layer = 2 +inertia = 0.17 +gravity_scale = 0.0 +linear_damp = 6.0 +script = ExtResource("1_o16jw") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -1.288) +scale = Vector2(1.5, 1.5) +texture = ExtResource("2_otyy4") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2(2, 2) +shape = SubResource("CircleShape2D_svirt") + +[connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/Scenes/Cupcakes/rvelCupcake.tscn b/Scenes/Cupcakes/rvelCupcake.tscn new file mode 100644 index 0000000..79d9e0d --- /dev/null +++ b/Scenes/Cupcakes/rvelCupcake.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=4 format=3 uid="uid://bh3snjiwx8l0v"] + +[ext_resource type="Script" path="res://Scripts/Cupcakes/rvelCupcake.gd" id="1_q06vq"] +[ext_resource type="Texture2D" uid="uid://b6x1m6u01x377" path="res://Art/Cupcakes/RVelCupcake.png" id="2_c48o5"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_svirt"] +radius = 10.5119 + +[node name="RVelCupcake" type="RigidBody2D"] +collision_layer = 2 +inertia = 0.17 +gravity_scale = 0.0 +linear_damp = 6.0 +script = ExtResource("1_q06vq") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +position = Vector2(0, -1.288) +scale = Vector2(1.5, 1.5) +texture = ExtResource("2_c48o5") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +scale = Vector2(2, 2) +shape = SubResource("CircleShape2D_svirt") + +[connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/Scenes/Locations/neighYard.tscn b/Scenes/Locations/neighYard.tscn new file mode 100644 index 0000000..e2db412 --- /dev/null +++ b/Scenes/Locations/neighYard.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://ja62vsvabsy5"] + +[ext_resource type="Texture2D" uid="uid://b3j662tj6h5vq" path="res://Art/Locations/yard1.png" id="1_o36nf"] + +[node name="Sprite2D" type="Sprite2D"] +position = Vector2(-33.9999, -26) +scale = Vector2(0.330667, 0.3361) +texture = ExtResource("1_o36nf") +centered = false +flip_h = true diff --git a/Scenes/Tools/bakingTray.tscn b/Scenes/Tools/bakingTray.tscn new file mode 100644 index 0000000..4b4053b --- /dev/null +++ b/Scenes/Tools/bakingTray.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=4 format=3 uid="uid://c6c0wy62gdsd0"] + +[ext_resource type="Texture2D" uid="uid://0vm8bhbkhqym" path="res://Art/Cupcakes/NightCupcake.png" id="1_rcylv"] +[ext_resource type="Script" path="res://Scripts/Tools/bakingTray.gd" id="1_x6kvb"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_nw58x"] +radius = 113.004 + +[node name="Tool" type="RigidBody2D"] +collision_layer = 3 +collision_mask = 3 +script = ExtResource("1_x6kvb") + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_rcylv") +offset = Vector2(0, -64) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +light_mask = 3 +visibility_layer = 3 +shape = SubResource("CircleShape2D_nw58x") diff --git a/Scenes/Tools/hooves.tscn b/Scenes/Tools/hooves.tscn new file mode 100644 index 0000000..b8b440b --- /dev/null +++ b/Scenes/Tools/hooves.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=3 format=3 uid="uid://df213kk2wwp71"] + +[ext_resource type="Script" path="res://Scripts/Tools/hooves.gd" id="1_o1lbx"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_nw58x"] +radius = 68.0661 + +[node name="Tool" type="RigidBody2D"] +collision_layer = 3 +collision_mask = 3 +script = ExtResource("1_o1lbx") + +[node name="Sprite2D" type="Sprite2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +light_mask = 3 +visibility_layer = 3 +shape = SubResource("CircleShape2D_nw58x") diff --git a/Scenes/Tools/tool.tscn b/Scenes/Tools/tool.tscn new file mode 100644 index 0000000..58a4dd0 --- /dev/null +++ b/Scenes/Tools/tool.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=2 format=3 uid="uid://tqkm3r2c3uru"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_nw58x"] +radius = 68.0661 + +[node name="Tool" type="RigidBody2D"] +collision_layer = 3 +collision_mask = 3 + +[node name="Sprite2D" type="Sprite2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +light_mask = 3 +visibility_layer = 3 +shape = SubResource("CircleShape2D_nw58x") diff --git a/Scenes/UI/ingame_ui.tscn b/Scenes/UI/ingame_ui.tscn index 2120985..d2b7afb 100644 --- a/Scenes/UI/ingame_ui.tscn +++ b/Scenes/UI/ingame_ui.tscn @@ -1,9 +1,13 @@ -[gd_scene load_steps=5 format=3 uid="uid://c4dtrk2kooa6q"] +[gd_scene load_steps=9 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"] +[ext_resource type="Texture2D" uid="uid://b6x1m6u01x377" path="res://Art/Cupcakes/RVelCupcake.png" id="5_dcln5"] +[ext_resource type="Texture2D" uid="uid://c3oejmmv6ysxp" path="res://Art/Cupcakes/CinCupcake.png" id="6_75s1v"] +[ext_resource type="Texture2D" uid="uid://dc43quvhcwa8e" path="res://Art/Cupcakes/HonCupcake.png" id="7_shcyg"] +[ext_resource type="Texture2D" uid="uid://0vm8bhbkhqym" path="res://Art/Cupcakes/NightCupcake.png" id="8_ei4oh"] [node name="InGameUI" type="CanvasLayer"] script = ExtResource("1_q8tnv") @@ -23,6 +27,14 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +[node name="Tools" type="Button" parent="Main/HBoxContainer"] +layout_mode = 2 +text = "Tools" + +[node name="Areas" type="Button" parent="Main/HBoxContainer"] +layout_mode = 2 +text = "Areas" + [node name="Van" type="Button" parent="Main/HBoxContainer"] layout_mode = 2 icon = ExtResource("2_65fff") @@ -41,31 +53,27 @@ icon = ExtResource("1_vkoxt") [node name="RVel" type="Button" parent="Main/HBoxContainer"] visible = false layout_mode = 2 +icon = ExtResource("5_dcln5") [node name="Cin" type="Button" parent="Main/HBoxContainer"] visible = false layout_mode = 2 +icon = ExtResource("6_75s1v") [node name="Honest" type="Button" parent="Main/HBoxContainer"] visible = false layout_mode = 2 +icon = ExtResource("7_shcyg") [node name="Nightmare" type="Button" parent="Main/HBoxContainer"] visible = false layout_mode = 2 +icon = ExtResource("8_ei4oh") [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 @@ -121,10 +129,10 @@ layout_mode = 2 text = "0" fit_content = true -[node name="redVelvetIcon" type="TextureRect" parent="Num/NumGrid"] +[node name="rvelIcon" type="TextureRect" parent="Num/NumGrid"] visible = false layout_mode = 2 -texture = ExtResource("3_xle4l") +texture = ExtResource("5_dcln5") stretch_mode = 5 [node name="ccRVelNum" type="RichTextLabel" parent="Num/NumGrid"] @@ -133,10 +141,10 @@ layout_mode = 2 text = "0" fit_content = true -[node name="cinnamonIcon" type="TextureRect" parent="Num/NumGrid"] +[node name="cinIcon" type="TextureRect" parent="Num/NumGrid"] visible = false layout_mode = 2 -texture = ExtResource("3_xle4l") +texture = ExtResource("6_75s1v") stretch_mode = 5 [node name="ccCinNum" type="RichTextLabel" parent="Num/NumGrid"] @@ -145,10 +153,10 @@ layout_mode = 2 text = "0" fit_content = true -[node name="honestIcon" type="TextureRect" parent="Num/NumGrid"] +[node name="honIcon" type="TextureRect" parent="Num/NumGrid"] visible = false layout_mode = 2 -texture = ExtResource("3_xle4l") +texture = ExtResource("7_shcyg") stretch_mode = 5 [node name="ccHonNum" type="RichTextLabel" parent="Num/NumGrid"] @@ -157,10 +165,10 @@ layout_mode = 2 text = "0" fit_content = true -[node name="nightmareIcon" type="TextureRect" parent="Num/NumGrid"] +[node name="nightIcon" type="TextureRect" parent="Num/NumGrid"] visible = false layout_mode = 2 -texture = ExtResource("3_xle4l") +texture = ExtResource("8_ei4oh") stretch_mode = 5 [node name="ccNightNum" type="RichTextLabel" parent="Num/NumGrid"] @@ -192,6 +200,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +[connection signal="pressed" from="Main/HBoxContainer/Tools" to="." method="_on_tools_pressed"] +[connection signal="pressed" from="Main/HBoxContainer/Areas" to="." method="_on_areas_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/Straw" to="." method="_on_straw_pressed"] diff --git a/Scenes/UI/upgrades.tscn b/Scenes/UI/upgrades.tscn index 05c6be2..906d517 100644 --- a/Scenes/UI/upgrades.tscn +++ b/Scenes/UI/upgrades.tscn @@ -1,9 +1,12 @@ -[gd_scene load_steps=5 format=3 uid="uid://cpv7y67qtmino"] +[gd_scene load_steps=8 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"] +[ext_resource type="Texture2D" uid="uid://b6x1m6u01x377" path="res://Art/Cupcakes/RVelCupcake.png" id="5_ua4fs"] +[ext_resource type="Texture2D" uid="uid://c3oejmmv6ysxp" path="res://Art/Cupcakes/CinCupcake.png" id="6_58pov"] +[ext_resource type="Texture2D" uid="uid://dc43quvhcwa8e" path="res://Art/Cupcakes/HonCupcake.png" id="7_q31a5"] [node name="Upgrades" type="CanvasLayer"] script = ExtResource("1_ofi8s") @@ -51,7 +54,264 @@ offset_bottom = 379.0 grow_horizontal = 2 grow_vertical = 2 +[node name="ToolScroll" 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 +vertical_scroll_mode = 2 + +[node name="ToolGrid" type="GridContainer" parent="Control/ToolScroll"] +custom_minimum_size = Vector2(256, 256) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="ToolLabel" type="Label" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 +text = "Tools" + +[node name="Tool1" type="HBoxContainer" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/ToolScroll/ToolGrid/Tool1"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/ToolScroll/ToolGrid/Tool1"] +layout_mode = 2 +text = "Hooves" + +[node name="Price" type="Label" parent="Control/ToolScroll/ToolGrid/Tool1"] +layout_mode = 2 +text = "Owned" + +[node name="Buy" type="Button" parent="Control/ToolScroll/ToolGrid/Tool1"] +layout_mode = 2 +text = "Equip" + +[node name="Desc" type="Label" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 +text = "Your own four hooves" + +[node name="Tool2" type="HBoxContainer" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/ToolScroll/ToolGrid/Tool2"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/ToolScroll/ToolGrid/Tool2"] +layout_mode = 2 +text = "Baking Tray" + +[node name="Price" type="Label" parent="Control/ToolScroll/ToolGrid/Tool2"] +layout_mode = 2 +text = "500" + +[node name="Buy" type="Button" parent="Control/ToolScroll/ToolGrid/Tool2"] +layout_mode = 2 +text = "Buy" + +[node name="Desc2" type="Label" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 +text = "Seems logical" + +[node name="Tool3" type="HBoxContainer" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/ToolScroll/ToolGrid/Tool3"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/ToolScroll/ToolGrid/Tool3"] +layout_mode = 2 +text = "???" + +[node name="Price" type="Label" parent="Control/ToolScroll/ToolGrid/Tool3"] +layout_mode = 2 +text = "???" + +[node name="Buy" type="Button" parent="Control/ToolScroll/ToolGrid/Tool3"] +layout_mode = 2 +text = "Buy" + +[node name="Desc3" type="Label" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 +text = "???" + +[node name="Tool4" type="HBoxContainer" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/ToolScroll/ToolGrid/Tool4"] +layout_mode = 2 +texture = ExtResource("3_c5nuv") + +[node name="Name" type="Label" parent="Control/ToolScroll/ToolGrid/Tool4"] +layout_mode = 2 +text = "???" + +[node name="Price" type="Label" parent="Control/ToolScroll/ToolGrid/Tool4"] +layout_mode = 2 +text = "???" + +[node name="Buy" type="Button" parent="Control/ToolScroll/ToolGrid/Tool4"] +layout_mode = 2 +text = "Buy" + +[node name="Desc4" type="Label" parent="Control/ToolScroll/ToolGrid"] +layout_mode = 2 +text = "???" + +[node name="AreaScroll" type="ScrollContainer" parent="Control"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +vertical_scroll_mode = 2 + +[node name="AreaGrid" type="GridContainer" parent="Control/AreaScroll"] +custom_minimum_size = Vector2(256, 256) +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="AreaLabel" type="Label" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 +text = "Areas" + +[node name="Area1" type="HBoxContainer" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +text = "Your Yard" + +[node name="VanIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="ChocIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +texture = ExtResource("3_c5nuv") + +[node name="StrawIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +texture = ExtResource("2_c66ch") + +[node name="Buy" type="Button" parent="Control/AreaScroll/AreaGrid/Area1"] +layout_mode = 2 +disabled = true +text = "Teleport (You're here!)" + +[node name="Desc" type="Label" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 +text = "A place of solitude, ruined by cupcakes." + +[node name="Area2" type="HBoxContainer" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +text = "Neighbors Yard" + +[node name="VanIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="ChocIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("3_c5nuv") + +[node name="StrawIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("2_c66ch") + +[node name="RVelIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("5_ua4fs") + +[node name="CinIcon" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("6_58pov") + +[node name="Buy" type="Button" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +text = "Buy" + +[node name="TextureRect2" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +texture = ExtResource("2_c66ch") + +[node name="Price" type="Label" parent="Control/AreaScroll/AreaGrid/Area2"] +layout_mode = 2 +text = "15000" + +[node name="Desc2" type="Label" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 +text = "The remains of your neighbors lawn after the cupcake apocolypse." + +[node name="Area3" type="HBoxContainer" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area3"] +layout_mode = 2 +texture = ExtResource("2_ydoya") + +[node name="Name" type="Label" parent="Control/AreaScroll/AreaGrid/Area3"] +layout_mode = 2 +text = "???" + +[node name="Buy" type="Button" parent="Control/AreaScroll/AreaGrid/Area3"] +layout_mode = 2 +text = "Buy" + +[node name="Price" type="Label" parent="Control/AreaScroll/AreaGrid/Area3"] +layout_mode = 2 +text = "40000" + +[node name="Desc3" type="Label" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 +text = "???" + +[node name="Area4" type="HBoxContainer" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="Control/AreaScroll/AreaGrid/Area4"] +layout_mode = 2 +texture = ExtResource("7_q31a5") + +[node name="Name" type="Label" parent="Control/AreaScroll/AreaGrid/Area4"] +layout_mode = 2 +text = "Dungeon of Honesty" + +[node name="Buy" type="Button" parent="Control/AreaScroll/AreaGrid/Area4"] +layout_mode = 2 +text = "Buy" + +[node name="Price" type="Label" parent="Control/AreaScroll/AreaGrid/Area4"] +layout_mode = 2 +text = "75000" + +[node name="Desc4" type="Label" parent="Control/AreaScroll/AreaGrid"] +layout_mode = 2 +text = "Find Honest cupcakes by defeating enemies here." + [node name="VanScroll" type="ScrollContainer" parent="Control"] +visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -362,7 +622,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/StrawScroll/StrawGrid/StrawUp4"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("5_ua4fs") [node name="Name" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp4"] layout_mode = 2 @@ -374,7 +634,7 @@ text = "Unlock Red Velvet Cupcakes" [node name="Price" type="Label" parent="Control/StrawScroll/StrawGrid/StrawUp4"] layout_mode = 2 -text = "75000" +text = "100000" [node name="Buy" type="Button" parent="Control/StrawScroll/StrawGrid/StrawUp4"] layout_mode = 2 @@ -397,26 +657,26 @@ size_flags_horizontal = 3 layout_mode = 2 text = "Red Velvet Cupcake Upgrades" -[node name="RvelUp1" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"] +[node name="RVelUp1" type="HBoxContainer" parent="Control/RVelScroll/RVelGrid"] layout_mode = 2 -[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RvelUp1"] +[node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp1"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("5_ua4fs") -[node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RvelUp1"] +[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"] +[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"] +[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"] +[node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RVelUp1"] layout_mode = 2 text = "Buy" @@ -425,7 +685,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp2"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("5_ua4fs") [node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp2"] layout_mode = 2 @@ -448,7 +708,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp3"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("5_ua4fs") [node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp3"] layout_mode = 2 @@ -471,7 +731,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/RVelScroll/RVelGrid/RVelUp4"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("6_58pov") [node name="Name" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp4"] layout_mode = 2 @@ -483,7 +743,7 @@ text = "Unlock Cinnamon Cupcakes" [node name="Price" type="Label" parent="Control/RVelScroll/RVelGrid/RVelUp4"] layout_mode = 2 -text = "75000" +text = "125000" [node name="Buy" type="Button" parent="Control/RVelScroll/RVelGrid/RVelUp4"] layout_mode = 2 @@ -511,7 +771,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp1"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("6_58pov") [node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp1"] layout_mode = 2 @@ -534,7 +794,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp2"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("6_58pov") [node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp2"] layout_mode = 2 @@ -557,7 +817,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp3"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("6_58pov") [node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp3"] layout_mode = 2 @@ -580,7 +840,7 @@ layout_mode = 2 [node name="TextureRect" type="TextureRect" parent="Control/CinScroll/CinGrid/CinUp4"] layout_mode = 2 -texture = ExtResource("2_c66ch") +texture = ExtResource("7_q31a5") [node name="Name" type="Label" parent="Control/CinScroll/CinGrid/CinUp4"] layout_mode = 2 @@ -592,7 +852,7 @@ text = "Unlock Honest Cupcakes" [node name="Price" type="Label" parent="Control/CinScroll/CinGrid/CinUp4"] layout_mode = 2 -text = "75000" +text = "150000" [node name="Buy" type="Button" parent="Control/CinScroll/CinGrid/CinUp4"] layout_mode = 2 @@ -932,6 +1192,10 @@ layout_mode = 2 text = "Buy" [connection signal="pressed" from="Close" to="." method="_on_close_pressed"] +[connection signal="pressed" from="Control/ToolScroll/ToolGrid/Tool1/Buy" to="." method="_on_tool_1_pressed"] +[connection signal="pressed" from="Control/ToolScroll/ToolGrid/Tool2/Buy" to="." method="_on_tool_2_pressed"] +[connection signal="pressed" from="Control/AreaScroll/AreaGrid/Area1/Buy" to="." method="_on_your_yard_pressed"] +[connection signal="pressed" from="Control/AreaScroll/AreaGrid/Area2/Buy" to="." method="_on_buy_neighbors_yard_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"] @@ -944,7 +1208,7 @@ text = "Buy" [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/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"] diff --git a/Scenes/game_world.tscn b/Scenes/game_world.tscn index dde3f21..85f394a 100644 --- a/Scenes/game_world.tscn +++ b/Scenes/game_world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://dlypem0porccr"] +[gd_scene load_steps=14 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"] @@ -8,6 +8,10 @@ [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"] +[ext_resource type="PackedScene" uid="uid://bh3snjiwx8l0v" path="res://Scenes/Cupcakes/rvelCupcake.tscn" id="8_y2btb"] +[ext_resource type="PackedScene" uid="uid://c373r4pv46ydj" path="res://Scenes/Cupcakes/cinCupcake.tscn" id="9_4x6i5"] +[ext_resource type="PackedScene" uid="uid://ciciat7jdjboy" path="res://Scenes/Cupcakes/honCupcake.tscn" id="10_ui0cc"] +[ext_resource type="PackedScene" uid="uid://bptnammqx5dk2" path="res://Scenes/Cupcakes/nightCupcake.tscn" id="11_n5j3q"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_g5fj2"] size = Vector2(1820, 986) @@ -30,13 +34,32 @@ script = ExtResource("2_bjylp") [node name="Cupcakes" type="Node2D" parent="."] [node name="VanCupcake" parent="Cupcakes" instance=ExtResource("2_fi3r2")] -position = Vector2(647, -65) +position = Vector2(746, -1450) +freeze = true [node name="ChocCupcake" parent="Cupcakes" instance=ExtResource("6_8pgeb")] -position = Vector2(713, -69) +position = Vector2(811, -1449) +freeze = true [node name="StrawCupcake" parent="Cupcakes" instance=ExtResource("7_mcfjy")] -position = Vector2(778, -60) +position = Vector2(877, -1445) +freeze = true + +[node name="RVelCupcake" parent="Cupcakes" instance=ExtResource("8_y2btb")] +position = Vector2(938, -1446) +freeze = true + +[node name="CinCupcake" parent="Cupcakes" instance=ExtResource("9_4x6i5")] +position = Vector2(1000, -1450) +freeze = true + +[node name="HonCupcake" parent="Cupcakes" instance=ExtResource("10_ui0cc")] +position = Vector2(1058, -1446) +freeze = true + +[node name="NightCupcake" parent="Cupcakes" instance=ExtResource("11_n5j3q")] +position = Vector2(1118, -1448) +freeze = true [node name="PlayArea" type="Area2D" parent="."] light_mask = 3 @@ -49,6 +72,7 @@ script = ExtResource("3_3x1i6") position = Vector2(957, 539) shape = SubResource("RectangleShape2D_g5fj2") +[connection signal="abandonedCastle" from="Upgrades" to="." method="_on_upgrades_abandoned_castle"] [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"] @@ -62,7 +86,9 @@ shape = SubResource("RectangleShape2D_g5fj2") [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="honestDungeon" from="Upgrades" to="." method="_on_upgrades_honest_dungeon"] [connection signal="horseHealth" from="Upgrades" to="." method="_on_upgrades_horse_health"] +[connection signal="neighYard" from="Upgrades" to="." method="_on_upgrades_neigh_yard"] [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"] @@ -70,16 +96,25 @@ shape = SubResource("RectangleShape2D_g5fj2") [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="tool1" from="Upgrades" to="." method="_on_upgrades_tool_1"] +[connection signal="tool2" from="Upgrades" to="." method="_on_upgrades_tool_2"] [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="yourYard" from="Upgrades" to="." method="_on_upgrades_your_yard"] [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="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="ccRVelCollected" from="Cupcakes/RVelCupcake" to="." method="_on_rvel_cupcake_cc_rvel_collected"] +[connection signal="ccCinCollected" from="Cupcakes/CinCupcake" to="." method="_on_cin_cupcake_cc_cin_collected"] +[connection signal="ccHonCollected" from="Cupcakes/HonCupcake" to="." method="_on_honest_cupcake_cc_hon_collected"] +[connection signal="ccNightCollected" from="Cupcakes/NightCupcake" to="." method="_on_night_cupcake_cc_night_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"] +[connection signal="body_exited" from="PlayArea" to="Cupcakes/RVelCupcake" method="_on_play_area_body_exited"] +[connection signal="body_exited" from="PlayArea" to="Cupcakes/CinCupcake" method="_on_play_area_body_exited"] diff --git a/Scripts/Cupcakes/cinCupcake.gd b/Scripts/Cupcakes/cinCupcake.gd new file mode 100644 index 0000000..670b105 --- /dev/null +++ b/Scripts/Cupcakes/cinCupcake.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +signal ccCinCollected() + +func _on_play_area_body_exited(body): + if body.get_parent() == $"../../Cupcakes" and body.name.find("Cin") != -1: + emit_signal("ccCinCollected") + body.queue_free() + diff --git a/Scripts/Cupcakes/honCupcake.gd b/Scripts/Cupcakes/honCupcake.gd new file mode 100644 index 0000000..584311b --- /dev/null +++ b/Scripts/Cupcakes/honCupcake.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +signal ccHonCollected() + +func _on_play_area_body_exited(body): + if body.get_parent() == $"../../Cupcakes" and body.name.find("Hon") != -1: + emit_signal("ccHonCollected") + body.queue_free() + diff --git a/Scripts/Cupcakes/nightCupcake.gd b/Scripts/Cupcakes/nightCupcake.gd new file mode 100644 index 0000000..a4b0887 --- /dev/null +++ b/Scripts/Cupcakes/nightCupcake.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +signal ccNightCollected() + +func _on_play_area_body_exited(body): + if body.get_parent() == $"../../Cupcakes" and body.name.find("Night") != -1: + emit_signal("ccNightCollected") + body.queue_free() + diff --git a/Scripts/Cupcakes/rvelCupcake.gd b/Scripts/Cupcakes/rvelCupcake.gd new file mode 100644 index 0000000..d836813 --- /dev/null +++ b/Scripts/Cupcakes/rvelCupcake.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +signal ccRVelCollected() + +func _on_play_area_body_exited(body): + if body.get_parent() == $"../../Cupcakes" and body.name.find("RVel") != -1: + emit_signal("ccRVelCollected") + body.queue_free() + diff --git a/Scripts/Tools/bakingTray.gd b/Scripts/Tools/bakingTray.gd new file mode 100644 index 0000000..43cc874 --- /dev/null +++ b/Scripts/Tools/bakingTray.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +var mouse_position = Vector2.ZERO + +signal hit() + +func _process(delta): + mouse_position = lerp(mouse_position, get_global_mouse_position(), 0.02) + look_at(mouse_position) diff --git a/Scripts/Tools/hooves.gd b/Scripts/Tools/hooves.gd new file mode 100644 index 0000000..43cc874 --- /dev/null +++ b/Scripts/Tools/hooves.gd @@ -0,0 +1,9 @@ +extends RigidBody2D + +var mouse_position = Vector2.ZERO + +signal hit() + +func _process(delta): + mouse_position = lerp(mouse_position, get_global_mouse_position(), 0.02) + look_at(mouse_position) diff --git a/Scripts/game_world.gd b/Scripts/game_world.gd index f7ae059..d56cab6 100644 --- a/Scripts/game_world.gd +++ b/Scripts/game_world.gd @@ -25,7 +25,7 @@ var ccChocPrice: int = 10 var ccChocPrice2: int = 15 var ccChocPrice3: int = 15 var ccChocPrice4: int = 500 -var ccChocPrice5: int +var ccChocPrice5: int = 150 var ccChocPrice6: int var ccStrawPrice: int = 10 var ccStrawPrice2: int = 15 @@ -41,7 +41,7 @@ var ccCinPrice: int = 10 var ccCinPrice2: int = 15 var ccCinPrice3: int = 15 var ccCinPrice4: int = 1250 -var ccNonPrice: int = 10 +var ccHonPrice: int = 10 var ccHonPrice2: int = 15 var ccHonPrice3: int = 15 var ccHonPrice4: int = 1500 @@ -63,18 +63,18 @@ 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 location = preload("res://Scenes/Locations/yard.tscn") var horse_scene = preload("res://Scenes/horse.tscn") var horse = preload("res://Scripts/horse.gd") +#Cupcakes var ccVanilla = preload("res://Scenes/Cupcakes/cupcake.tscn") var ccChocolate = preload("res://Scenes/Cupcakes/chocCupcake.tscn") var ccStrawberry = preload("res://Scenes/Cupcakes/strawCupcake.tscn") -var ccRedVelvet -var ccCinnamon -var ccHonest -var ccNightmare +var ccRedVelvet = preload("res://Scenes/Cupcakes/rvelCupcake.tscn") +var ccCinnamon = preload("res://Scenes/Cupcakes/cupcake.tscn") +var ccHonest = preload("res://Scenes/Cupcakes/honCupcake.tscn") +var ccNightmare = preload("res://Scenes/Cupcakes/nightCupcake.tscn") var ccRock var ccRuby var ccSapphire @@ -83,14 +83,21 @@ var ccDiamond var ccLoyal var ccChaos +#Areas +var yourYard = preload("res://Scenes/Locations/yard.tscn") +var neighYard = preload("res://Scenes/Locations/neighYard.tscn") + +#Area Locks +var neighYardLocked = true + #Instantiations var ccVan = ccVanilla.instantiate() var ccChoc = ccChocolate.instantiate() var ccStraw = ccStrawberry.instantiate() -var ccRVel = ccRedVelvet -var ccCin = ccCinnamon -var ccHon = ccHonest -var ccNight = ccNightmare +var ccRVel = ccRedVelvet.instantiate() +var ccCin = ccCinnamon.instantiate() +var ccHon = ccHonest.instantiate() +var ccNight = ccNightmare.instantiate() var ccRoc = ccRock var ccRub = ccRuby var ccSap = ccSapphire @@ -117,7 +124,9 @@ var ccChaLocked = true var ccVanSpawnRate = 30 var ccChocSpawnRate = 30 var ccStrawSpawnRate = 30 -var ccRVelSpawnRate = 3 +var ccRVelSpawnRate = 30 +var ccCinSpawnRate = 30 +var ccHonSpawnRate = 3 var ccNightSpawnRate = 3 var ccRocSpawnRate = 3 var ccRubSpawnRate = 3 @@ -131,35 +140,62 @@ var comboLocked = true var combo = 1.00 var comboMultiplier +#Tools +var tool +var toolHooves = preload("res://Scenes/Tools/hooves.tscn") +var toolHoovesScene = toolHooves.instantiate() +var toolBakingTray = preload("res://Scenes/Tools/bakingTray.tscn") +var toolBakingTrayScene = toolBakingTray.instantiate() + #Other @onready var timer = get_node("Cupcake Spawn Timer") var horseAttached = true var horse_instance +var horseScene var mouse_position = Vector2.ZERO var ccCount = 0 var ccMaxOnScreen = 3000 +var location + #General func _ready(): - var spawn horse_instance = horse_scene.instantiate() - spawn = location.instantiate() - $Location.add_child(spawn) add_child(horse_instance) + location = yourYard + spawnHorse() + tool = toolHoovesScene + add_child(tool) + func _process(delta): if horseAttached == true: mouse_position = get_global_mouse_position() horse_instance.position = mouse_position - handleInput() + if $"Tool": + tool.position = mouse_position + handleInput()#don't ask + func handleInput(): + #I hate this so much but I'm retarded if Input.is_action_pressed("horseAttach"): if horseAttached == true: horseAttached = false else: horseAttached = true +#AreaTeleporter +func spawnHorse(): + var spawn + spawn = location.instantiate() + $Location.add_child(spawn) + +#Tool Refresh +func toolRefresh(): + pass + +#Update Count func collectCupcakes(): $InGameUI/Num/NumGrid/ccVanNum.text = str(ccVanNum) $InGameUI/Num/NumGrid/ccChocNum.text = str(ccChocNum) @@ -169,6 +205,7 @@ func collectCupcakes(): $InGameUI/Num/NumGrid/ccHonNum.text = str(ccHonNum) $InGameUI/Num/NumGrid/ccNightNum.text = str(ccNightmareNum) +#Cupcake Timer func _on_timeout(): spawnVanCupcakes() if ccChocLocked == false: @@ -179,11 +216,6 @@ func _on_timeout(): spawnRVelCupcakes() if ccCinLocked == false: spawnCinCupcakes() - if ccHonLocked == false: - spawnHonCupcakes() - if ccNightLocked == false: - spawnNightCupcakes() - collectCupcakes() timer.start @@ -194,8 +226,8 @@ func spawnVanCupcakes(): randomize() if ccCount <= ccMaxOnScreen: for i in range(ccVanSpawnRate): - randX = randi_range(10, 1910) - randY = randi_range(10, 1070) + randX = randi_range(50, 1870) + randY = randi_range(50, 1030) ccVan.position = Vector2(randX, randY) $Cupcakes.add_child(ccVan.duplicate()) ccCount = ccCount + ccVanSpawnRate @@ -206,8 +238,8 @@ func spawnChocCupcakes(): randomize() if ccCount <= ccMaxOnScreen: for i in range(ccChocSpawnRate): - randX = randi_range(10, 1910) - randY = randi_range(10, 1070) + randX = randi_range(50, 1870) + randY = randi_range(50, 1030) ccChoc.position = Vector2(randX, randY) $Cupcakes.add_child(ccChoc.duplicate()) ccCount = ccCount + ccChocSpawnRate @@ -218,17 +250,35 @@ func spawnStrawCupcakes(): randomize() if ccCount <= ccMaxOnScreen: for i in range(ccStrawSpawnRate): - randX = randi_range(10, 1910) - randY = randi_range(10, 1070) + randX = randi_range(50, 1870) + randY = randi_range(50, 1030) ccStraw.position = Vector2(randX, randY) $Cupcakes.add_child(ccStraw.duplicate()) ccCount = ccCount + ccStrawSpawnRate func spawnRVelCupcakes(): - pass + var randX + var randY + randomize() + if ccCount <= ccMaxOnScreen: + for i in range(ccRVelSpawnRate): + randX = randi_range(50, 1870) + randY = randi_range(50, 1030) + ccRVel.position = Vector2(randX, randY) + $Cupcakes.add_child(ccRVel.duplicate()) + ccCount = ccCount + ccRVelSpawnRate func spawnCinCupcakes(): - pass + var randX + var randY + randomize() + if ccCount <= ccMaxOnScreen: + for i in range(ccCinSpawnRate): + randX = randi_range(50, 1870) + randY = randi_range(50, 1030) + ccCin.position = Vector2(randX, randY) + $Cupcakes.add_child(ccCin.duplicate()) + ccCount = ccCount + ccCinSpawnRate func spawnHonCupcakes(): pass @@ -323,77 +373,77 @@ func _on_upgrades_condensed_cupcake_3(): #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) + if ccRVelNum >= ccRVelPrice: + ccRVelSpawnRate += 1 + ccRVelNum -= ccRVelPrice + ccRVelPrice = ccRVelPrice * 1.3 + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp1/Price.text = str(ccRVelPrice) collectCupcakes() func _on_upgrades_faster_cupcake_4(): - if ccChocNum >= ccChocPrice2: - ccChocNum -= ccChocPrice2 - ccChocPrice2 = ccChocPrice2 * 1.3 + if ccRVelNum >= ccRVelPrice2: + ccRVelNum -= ccRVelPrice2 + ccRVelPrice2 = ccRVelPrice2 * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2) + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp2/Price.text = str(ccRVelPrice2) 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) + if ccRVelNum >= ccRVelPrice3: + ccRVelNum -= ccRVelPrice3 + ccRVelPrice3 = ccRVelPrice3 * 1.3 + ccRVelValue += 1 + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp3/Price.text = str(ccRVelPrice3) 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) + if ccCinNum >= ccCinPrice: + ccCinSpawnRate += 1 + ccCinNum -= ccCinPrice + ccCinPrice = ccCinPrice * 1.3 + $Upgrades/Control/CinScroll/CinGrid/CinUp1/Price.text = str(ccCinPrice) collectCupcakes() func _on_upgrades_faster_cupcake_5(): - if ccChocNum >= ccChocPrice2: - ccChocNum -= ccChocPrice2 - ccChocPrice2 = ccChocPrice2 * 1.3 + if ccCinNum >= ccCinPrice2: + ccCinNum -= ccCinPrice2 + ccCinPrice2 = ccCinPrice2 * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2) + $Upgrades/Control/CinScroll/CinGrid/CinUp2/Price.text = str(ccCinPrice2) 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) + if ccCinNum >= ccCinPrice3: + ccCinNum -= ccCinPrice3 + ccCinPrice3 = ccCinPrice3 * 1.3 + ccCinValue += 1 + $Upgrades/Control/CinScroll/CinGrid/CinUp3/Price.text = str(ccCinPrice3) 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) + if ccHonNum >= ccHonPrice: + ccHonSpawnRate += 1 + ccHonNum -= ccHonPrice + ccHonPrice = ccHonPrice * 1.3 + $Upgrades/Control/HonScroll/HonGrid/HonUp1/Price.text = str(ccHonPrice) collectCupcakes() func _on_upgrades_faster_cupcake_6(): - if ccChocNum >= ccChocPrice2: - ccChocNum -= ccChocPrice2 - ccChocPrice2 = ccChocPrice2 * 1.3 + if ccHonNum >= ccHonPrice2: + ccHonNum -= ccHonPrice2 + ccHonPrice2 = ccHonPrice2 * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccChocPrice2) + $Upgrades/Control/HonScroll/HonGrid/HonUp2/Price.text = str(ccHonPrice2) 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) + if ccHonNum >= ccHonPrice3: + ccHonNum -= ccHonPrice3 + ccHonPrice3 = ccHonPrice3 * 1.3 + ccHonValue += 1 + $Upgrades/Control/HonScroll/HonGrid/HonUp3/Price.text = str(ccHonPrice3) collectCupcakes() func _on_upgrades_cupcake_damage(): @@ -430,10 +480,10 @@ func _on_upgrades_unlock_r_vel(): if ccStrawNum >= ccStrawPrice4: ccStrawNum -= ccStrawPrice4 ccRVelLocked = false - $"InGameUI/Main/HBoxContainer/Rvel".visible = true + $"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 + $"Upgrades/Control/StrawScroll/StrawGrid/StrawUp4/Buy".visible = false func _on_upgrades_unlock_cin(): if ccRVelNum >= ccRVelPrice4: @@ -442,7 +492,7 @@ func _on_upgrades_unlock_cin(): $"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 + $"Upgrades/Control/RVelScroll/RVelGrid/RVelUp4/Buy".visible = false func _on_upgrades_unlock_hon(): if ccCinNum >= ccCinPrice4: @@ -451,7 +501,7 @@ func _on_upgrades_unlock_hon(): $"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 + $"Upgrades/Control/CinScroll/CinGrid/CinUp4/Buy".visible = false func _on_upgrades_unlock_nightmare(): if ccHonNum >= ccHonPrice4: @@ -460,7 +510,7 @@ func _on_upgrades_unlock_nightmare(): $"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 + $"Upgrades/Control/HonScroll/HonGrid/HonUp4/Buy".visible = false #Collect func _on_van_cupcake_cc_van_collected(): @@ -494,12 +544,48 @@ func _on_honest_cupcake_cc_hon_collected(): collectCupcakes() func _on_night_cupcake_cc_night_collected(): - ccHonNum += ccHonValue + ccNightmareNum += ccNightmareValue ccCount -= 1 collectCupcakes() +#Areas +func _on_upgrades_your_yard(): + + if $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.disabled == false: + location = yourYard + $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.disabled = false + $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.disabled = true + $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.text = str("Teleport (You're here)") + $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.text = str("Teleport") + spawnHorse() + +func _on_upgrades_neigh_yard(): + #if ccStrawNum >= ccStrawPrice5 and neighYardLocked == false: + # ccStrawNum -= ccStrawPrice5 + # $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.text = str("Teleport") + #else: + if $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.disabled == false: + location = neighYard + $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.disabled = true + $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.disabled = false + $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.text = str("Teleport") + $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.text = str("Teleport (You're here)") + spawnHorse() + + + +func _on_upgrades_honest_dungeon(): + pass # Replace with function body. + +func _on_upgrades_abandoned_castle(): + pass # Replace with function body. + +#Tools +func _on_upgrades_tool_1(): + tool = toolHoovesScene + - - +func _on_upgrades_tool_2(): + tool = toolBakingTrayScene diff --git a/Scripts/horse.gd b/Scripts/horse.gd index 5948da8..f896a5b 100644 --- a/Scripts/horse.gd +++ b/Scripts/horse.gd @@ -7,6 +7,3 @@ signal hit() func _process(delta): mouse_position = lerp(mouse_position, get_global_mouse_position(), 0.02) look_at(mouse_position) - #var horse_direction = (mouse_position - horse_instance.position).normalized() - #horse_instance.rotation = horse_direction.angle() - #horse_instance.get_node("Sprite2D").rotation = horse_direction.angle() diff --git a/Scripts/ingame_ui.gd b/Scripts/ingame_ui.gd index 610ea84..b63a456 100644 --- a/Scripts/ingame_ui.gd +++ b/Scripts/ingame_ui.gd @@ -9,6 +9,8 @@ extends CanvasLayer @onready var cinUp = $"../Upgrades/Control/CinScroll" @onready var honUp = $"../Upgrades/Control/HonScroll" @onready var nightUp = $"../Upgrades/Control/NightScroll" +@onready var areas = $"../Upgrades/Control/AreaScroll" +@onready var tools = $"../Upgrades/Control/ToolScroll" func _on_van_pressed(): if vanUp.visible == false: @@ -90,3 +92,26 @@ func _on_nightmare_pressed(): upgrades.visible = true else: upgrades.visible = false + + +func _on_areas_pressed(): + if areas.visible == false: + for child in allUp: + child.visible = false + areas.visible = true + else: + if upgrades.visible == false: + upgrades.visible = true + else: + upgrades.visible = false + +func _on_tools_pressed(): + if tools.visible == false: + for child in allUp: + child.visible = false + tools.visible = true + else: + if upgrades.visible == false: + upgrades.visible = true + else: + upgrades.visible = false diff --git a/Scripts/upgrades.gd b/Scripts/upgrades.gd index f6a1f76..b8354d0 100644 --- a/Scripts/upgrades.gd +++ b/Scripts/upgrades.gd @@ -1,5 +1,15 @@ extends CanvasLayer +#Areas +signal yourYard() +signal neighYard() +signal honestDungeon() +signal abandonedCastle() + +#Tools +signal tool1() +signal tool2() + #Vanilla signal oneMoreCupcake() signal fasterCupcake() @@ -40,106 +50,69 @@ func _on_close_pressed(): func _on_buy_pressed(): emit_signal("oneMoreCupcake") - func _on_buy_van2_pressed(): emit_signal("fasterCupcake") - 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") - 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 - - - - - +##Areas +func _on_your_yard_pressed(): + emit_signal("yourYard") +func _on_buy_neighbors_yard_pressed(): + emit_signal("neighYard") + +##Tools +func _on_tool_1_pressed(): + emit_signal("tool1") +func _on_tool_2_pressed(): + emit_signal("tool2")