From cd013050b9e4bc94d11965c2219384bbe3623142 Mon Sep 17 00:00:00 2001 From: OnlyMares Date: Fri, 10 Mar 2023 22:47:36 -0600 Subject: [PATCH] Almost 0.1 -5(7) cupcakes implemented. the other two require a future mechanic to obtain -now two areas, no difference and it's free currently -two tools, your hooves, and a baking tray, only hooves works for some reason --- .godot/editor/create_recent.Node | 8 +- .godot/editor/editor_layout.cfg | 6 +- .godot/editor/filesystem_cache8 | 24 +- .godot/editor/filesystem_update4 | 15 + ...state-bdbf2ba254a2078c85b005689e1549ff.cfg | 4 +- ...state-1d739c0c877f00d7b327b9018a2218eb.cfg | 4 +- ...lding-1d739c0c877f00d7b327b9018a2218eb.cfg | 2 +- .godot/editor/project_metadata.cfg | 4 +- .godot/editor/recent_dirs | 7 +- .godot/editor/script_editor_cache.cfg | 108 ++++++- .godot/uid_cache.bin | Bin 575 -> 1134 bytes Art/Cupcakes/CinCupcake.png | Bin 0 -> 716 bytes Art/Cupcakes/CinCupcake.png.import | 34 ++ Art/Cupcakes/HonCupcake.png | Bin 0 -> 738 bytes Art/Cupcakes/HonCupcake.png.import | 34 ++ Art/Cupcakes/NightCupcake.png | Bin 0 -> 578 bytes Art/Cupcakes/NightCupcake.png.import | 34 ++ Art/Cupcakes/RVelCupcake.png | Bin 0 -> 691 bytes Art/Cupcakes/RVelCupcake.png.import | 34 ++ Scenes/Cupcakes/cinCupcake.tscn | 26 ++ Scenes/Cupcakes/honCupcake.tscn | 26 ++ Scenes/Cupcakes/nightCupcake.tscn | 26 ++ Scenes/Cupcakes/rvelCupcake.tscn | 26 ++ Scenes/Locations/neighYard.tscn | 10 + Scenes/Tools/bakingTray.tscn | 21 ++ Scenes/Tools/hooves.tscn | 18 ++ Scenes/Tools/tool.tscn | 15 + Scenes/UI/ingame_ui.tscn | 44 ++- Scenes/UI/upgrades.tscn | 304 ++++++++++++++++-- Scenes/game_world.tscn | 43 ++- Scripts/Cupcakes/cinCupcake.gd | 9 + Scripts/Cupcakes/honCupcake.gd | 9 + Scripts/Cupcakes/nightCupcake.gd | 9 + Scripts/Cupcakes/rvelCupcake.gd | 9 + Scripts/Tools/bakingTray.gd | 9 + Scripts/Tools/hooves.gd | 9 + Scripts/game_world.gd | 246 +++++++++----- Scripts/horse.gd | 3 - Scripts/ingame_ui.gd | 25 ++ Scripts/upgrades.gd | 69 ++-- 40 files changed, 1064 insertions(+), 210 deletions(-) create mode 100644 Art/Cupcakes/CinCupcake.png create mode 100644 Art/Cupcakes/CinCupcake.png.import create mode 100644 Art/Cupcakes/HonCupcake.png create mode 100644 Art/Cupcakes/HonCupcake.png.import create mode 100644 Art/Cupcakes/NightCupcake.png create mode 100644 Art/Cupcakes/NightCupcake.png.import create mode 100644 Art/Cupcakes/RVelCupcake.png create mode 100644 Art/Cupcakes/RVelCupcake.png.import create mode 100644 Scenes/Cupcakes/cinCupcake.tscn create mode 100644 Scenes/Cupcakes/honCupcake.tscn create mode 100644 Scenes/Cupcakes/nightCupcake.tscn create mode 100644 Scenes/Cupcakes/rvelCupcake.tscn create mode 100644 Scenes/Locations/neighYard.tscn create mode 100644 Scenes/Tools/bakingTray.tscn create mode 100644 Scenes/Tools/hooves.tscn create mode 100644 Scenes/Tools/tool.tscn create mode 100644 Scripts/Cupcakes/cinCupcake.gd create mode 100644 Scripts/Cupcakes/honCupcake.gd create mode 100644 Scripts/Cupcakes/nightCupcake.gd create mode 100644 Scripts/Cupcakes/rvelCupcake.gd create mode 100644 Scripts/Tools/bakingTray.gd create mode 100644 Scripts/Tools/hooves.gd 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 eebff365dec143c506e948d87b6e9bf7a594ab14..70bc5a12088c39c2eee0166c57bd18940c9026bf 100644 GIT binary patch delta 450 zcmdnb@{WU1awDT1Q@zL4drJSV{IgeLU|=XpEw<9vcPuK=cP=eRPRvd%)(;9x&4F_C z3i8rTR(N!nT>B=Wj9s-~W_m^mlJYQ(Z!g+nHPRHZEBDCH6G2kF_3!dc?sl(Y6(`z? zi)H2^$#@^$^Dap4poZFHSw>08qB4Y=N{W;7zMoXQqEcHNrwWvn5=UqR$qA%t?>>D= z+zTWpDUp#6Hx(oq%^Z@Nf6c={9VF?LhwONev>Wrn#or5l3dz7-ADo<;2Mm;u{QR6^ z{SqLl2U551){?mfGN(CIC)Y7brRAjp&52AbN&(BUJ(&1RC5JUr4!ao{`T1q3#bA~9 dPfz~q_pT`c5fLc1B_(EO=B0-eC02q}0{}QHrRD$t delta 10 RcmaFIv7d#JcO#=6695xF0=fVI diff --git a/Art/Cupcakes/CinCupcake.png b/Art/Cupcakes/CinCupcake.png new file mode 100644 index 0000000000000000000000000000000000000000..43da6928875380f3c3532ff14d53a95bb1f06d72 GIT binary patch literal 716 zcmV;-0yF)IP)Px%hDk(0R7i>4mb-5gK@f+(JD)knCNg>GkdTs!$ORGwg$t5~E=7>;Pjx{-iICE` za1n{Zf&xT=upE>Jeq4O^Q0(lzZ9~gQr@hDQH?zN)T^s&;3xhzy;F)ambN>l?5eQEK z;;p{UU%|csPk=UX3-~|-dhbSS=WhguK_IEyj=B76I0p8BKJ-S_@Xb=Z0#1Mv0cOB& zi1y&K2Ym-{2+xB`y(^=IZvx?y2b~yNfTtgBE1ZXBC}!?exEc*v!qC?jP2dJzikWeb zkzzv)OBsjffe-_YOol_NaWe0Q^URCfmvl3ka&#e?5 zMn4{)76DVU{H{V*nQNH2w?H5G30$Qma{$7(fv_Mgz)-XAL}r6bGLT52f@$xDew%C1 zW9VIuoJ8Y8d^tO9n_|Seq$8dDSV6I_F5AijjaZBL@MDR`oH3I;7?zx!?x(xTZj?Eu zNm`V5+dX`|T;ehZ7C^lSZi$(-EX=e;^;u~Xxy(#GN>&HlJlMcJagwT-(@S*B+X@F! zeXI`(eW==buDaUl$eIJ&$&60&Bo!WothfH8l}vCL6DPciv%;l(!sHP)r+j#K!&70Z zy_eiOqp9e9imB%qYfd*8smQu4P`0p(%^91jwhGzQ64$gS_Ra%ZNjDU~R@xy4n&gbM yzXf3j!NUc{Tvsx-{;x=b?8{0U@n#JyYkvR{-_e&=`ykW+0000Px%oJmAMR7i>4mA`M(KorM6XD4Y>Q6fO5pV%?fPENG?mxc~I3h5)+aurrIEOy)5|{*x$!ak+0}nA=+Lu`f z>{##xpk;rk8BeP?wZPFk3?ExCNT3Te?H?C4&asqfoq3~{>SKgayk|EKfbZ~L!!B@% zNRif_u4fz#F)V@o0>d~&GzLKiSlWPJeZZn5CEy4Q>>;^d!!YxYT)65O8bW&!kVphf}kGw`eBofSaz0mB`60b$}0(#>=!v*Yf)fO6OGcQ{;oSV$R~>w{$f~1K45C`POrP0V|y9 UEN`f}bpQYW07*qoM6N<$g0{p?@&Et; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a887cad246edb3d7c9a78a00deff2d45838d06d4 GIT binary patch literal 578 zcmV-I0=@l-P)Px${7FPXR7i>4)lF~HKoG|9pJ|mSMW_+tMHMY_f_g}~@J0M-^C7r$B0?33Q3^S= z3PP%tw8b2Doj1~kKsmrjE63~I|I9u!ljZ-nG%Fov<)&p1wqbT;r4g<+uT6dh)~nN) zkRnGjj-KwV`|k#)@yH4G@dO{J4S9uLihMo%PHC_iy92tl6-QcT3}YwV|p+p@BV@G8Qh zC1^|_Lm_DXaqe(Yl4bBwR(gaQ#4+N0nS(=B$|%yR!274V`x(DWmG> zC5@co7!S=g{u-P&PUosVq{0*V-Y<9%q5YQ8BX@dn@VbOAiZ=qR-NR5w{H zx3VU4D3s_ZMIO|75kW;%t4h`c{SKX5^Mf~r9Z@cq;N9W|$m)~@-{Vjcmla2d+07gTYzjR5J QlK=n!07*qoM6N<$f?`4sJpcdz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90275fc7941fc1f8e912ab57ec2dc4037065bd9e GIT binary patch literal 691 zcmV;k0!;mhP)Px%ZAnByR7i>4)xm4yMij^Kj}&X8jolu$8|bM}L30RfkNW@5hC-pR2UD_8_E1h+g#xv z7TBP`CCknE`OkuD-v@RmafMg-fHjN2rm}Q5$#@=I3YsqEhbU8tdu-$5a%I_^awfs` zg*GA1)3~cv30hNCyMJ*uoHLPE4&ds zCX$KXzryE!!J#E1aP2zqZJPWSp z)FyZtPAnN8kn&Rmxliy5e9fkcJ-iTMmr{d-c=huB?os`IYI)#C7C#S)a+3zX;a2pt z^Y|$({{A4W(0iTL3n7ATk_-{B_=(LB{6cgVwcp`mvSLOo$RpNxNZVf}Xg0X2!8id6 zv{$sZV=L;f1g${Fy3q{tz8jAJos74>Ng^K{`a1|-3ubbx{qf~r>G2|O!ag= 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")