From 6aea376ad3b5ebfddbd1eded9425066212b37e3e Mon Sep 17 00:00:00 2001 From: OnlyMares Date: Tue, 7 Mar 2023 04:26:40 -0600 Subject: [PATCH] Nightly Push -added two new types of cupcake -cleaned up and organized a lot of code -paved way for a lot of future expansion -new cupcake art --- .godot/editor/create_recent.Node | 11 +- ...state-c7065fd652f87712eb190c1157c23200.cfg | 4 +- .godot/editor/editor_layout.cfg | 6 +- .godot/editor/filesystem_cache8 | 51 +++-- .godot/editor/filesystem_update4 | 12 +- ...state-bdbf2ba254a2078c85b005689e1549ff.cfg | 4 +- ...lding-bdbf2ba254a2078c85b005689e1549ff.cfg | 2 +- .godot/editor/project_metadata.cfg | 4 +- .godot/editor/recent_dirs | 2 +- .godot/editor/script_editor_cache.cfg | 46 ++-- .godot/uid_cache.bin | Bin 383 -> 846 bytes Art/Cupcakes/ChocCupcake.png | Bin 0 -> 990 bytes Art/Cupcakes/ChocCupcake.png.import | 34 +++ Art/Cupcakes/VanCupcake.png | Bin 0 -> 1070 bytes Art/Cupcakes/VanCupcake.png.import | 34 +++ ...ersionZero-Web.apple-touch-icon.png.import | 34 +++ ...eRevolutionVersionZero-Web.icon.png.import | 34 +++ ...upcakeRevolutionVersionZero-Web.png.import | 34 +++ Scenes/Cupcakes/chocCupcake.tscn | 26 +++ Scenes/Cupcakes/cupcake.tscn | 13 +- Scenes/Cupcakes/strawCupcake.tscn | 26 +++ Scenes/UI/ingame_ui.tscn | 79 +++++-- Scenes/UI/upgrades.tscn | 208 ++++++++++++++---- Scenes/game_world.tscn | 25 ++- Scripts/Cupcakes/chocCupcake.gd | 9 + Scripts/Cupcakes/cupcake.gd | 23 +- Scripts/Cupcakes/strawCupcake.gd | 9 + Scripts/game_world.gd | 196 ++++++++++++++--- Scripts/horse.gd | 13 +- Scripts/ingame_ui.gd | 22 +- Scripts/upgrades.gd | 51 ++++- Scripts/varConst.gd | 11 - Scripts/varVar.gd | 6 - 33 files changed, 801 insertions(+), 228 deletions(-) create mode 100644 Art/Cupcakes/ChocCupcake.png create mode 100644 Art/Cupcakes/ChocCupcake.png.import create mode 100644 Art/Cupcakes/VanCupcake.png create mode 100644 Art/Cupcakes/VanCupcake.png.import create mode 100644 Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.apple-touch-icon.png.import create mode 100644 Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.icon.png.import create mode 100644 Releases/Web/v0 Version Zero/CupcakeRevolutionVersionZero-Web.png.import create mode 100644 Scenes/Cupcakes/chocCupcake.tscn create mode 100644 Scenes/Cupcakes/strawCupcake.tscn create mode 100644 Scripts/Cupcakes/chocCupcake.gd create mode 100644 Scripts/Cupcakes/strawCupcake.gd delete mode 100644 Scripts/varConst.gd delete mode 100644 Scripts/varVar.gd diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 529675e..1583138 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,11 +1,13 @@ +Button +GridContainer +TextureRect +Label +ScrollContainer +RichTextLabel Control Container HBoxContainer -TextureRect Sprite2D -Label -Button -GridContainer ItemList VScrollBar VBoxContainer @@ -15,7 +17,6 @@ CollisionPolygon2D Node2D Area2D CanvasLayer -ScrollContainer AnimationPlayer TextureButton Timer diff --git a/.godot/editor/cupcake.tscn-editstate-c7065fd652f87712eb190c1157c23200.cfg b/.godot/editor/cupcake.tscn-editstate-c7065fd652f87712eb190c1157c23200.cfg index 549d73e..4b19067 100644 --- a/.godot/editor/cupcake.tscn-editstate-c7065fd652f87712eb190c1157c23200.cfg +++ b/.godot/editor/cupcake.tscn-editstate-c7065fd652f87712eb190c1157c23200.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-1354.04, -771.218), +"ofs": Vector2(-350.251, -204.433), "primary_grid_steps": 8, "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.890899 +"zoom": 3.1748 } 3D={ "fov": 70.01, diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 36029ce..7a26a1a 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 (3)" +dock_5="Inspector,Node,History,Commit (33)" [EditorNode] -open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn"] +open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/horse.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/Cupcakes/strawCupcake.tscn"] [ScriptEditor] -open_scripts=["res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/upgrades.gd", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd"] +open_scripts=["res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"] open_help=["Node"] script_split_offset=70 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 1314023..cc4915f 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,6 +1,6 @@ 2a60927148abd1d33b818b535e306557 -::res://::1678090313 -export_presets.cfg::TextFile::-1::1678010409::0::1::::<><>:: +::res://::1678098956 +export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>:: ::res://addons/::1677750379 ::res://addons/godot-git-plugin/::1677750379 @@ -13,28 +13,43 @@ THIRDPARTY.md::TextFile::-1::1677750379::0::1::::<><>:: ::res://Art/::1677787260 ::res://Art/Characters/::1677787257 defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>:: -::res://Art/Cupcakes/::1677787255 +::res://Art/Cupcakes/::1678176993 +ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>:: Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>:: +VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>:: ::res://Art/Locations/::1677787260 yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: ::res://Art/Upgrades/::1677787246 -::res://Scenes/::1678090225 -game_world.tscn::PackedScene::7981802964863433317::1678090225::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q -horse.tscn::PackedScene::8568825373134700876::1678090225::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke -::res://Scenes/Cupcakes/::1678090225 -cupcake.tscn::PackedScene::8468695979515826288::1678090225::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k -::res://Scenes/Locations/::1678090225 -yard.tscn::PackedScene::7883941411178408831::1678090225::0::1::::<><>::uid://b3j662tj6h5vq -::res://Scenes/UI/::1678090225 -ingame_ui.tscn::PackedScene::6815695514927101566::1678090225::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k -upgrades.tscn::PackedScene::5871013436024621816::1678090225::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k -::res://Scripts/::1678090225 +::res://Releases/::1678095890 +::res://Releases/Linux/::1678096050 +::res://Releases/Linux/v0 Version Zero/::1678095971 +::res://Releases/Linux/v0.1 Pre-Alpha/::1678096011 +::res://Releases/Web/::1678096071 +::res://Releases/Web/v0 Version Zero/::1678098957 +CupcakeRevolutionVersionZero-Web.apple-touch-icon.png::CompressedTexture2D::8870549502267300051::1678095404::1678098957::1::::<><>:: +CupcakeRevolutionVersionZero-Web.icon.png::CompressedTexture2D::943284379845401684::1678095404::1678098957::1::::<><>:: +CupcakeRevolutionVersionZero-Web.png::CompressedTexture2D::6033402053535540009::1678095404::1678098957::1::::<><>:: +::res://Releases/Windows/::1678096086 +::res://Releases/Windows/v0 Version Zero/::1678096086 +::res://Scenes/::1678176168 +game_world.tscn::PackedScene::7981802964863433317::1678176168::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q +horse.tscn::PackedScene::8568825373134700876::1678176168::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke +::res://Scenes/Cupcakes/::1678176420 +chocCupcake.tscn::PackedScene::5843790513687768897::1678176420::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k +cupcake.tscn::PackedScene::8468695979515826288::1678176168::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k +strawCupcake.tscn::PackedScene::3124004694192797727::1678177096::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k +::res://Scenes/Locations/::1678176168 +yard.tscn::PackedScene::7883941411178408831::1678176168::0::1::::<><>::uid://b3j662tj6h5vq +::res://Scenes/UI/::1678176168 +ingame_ui.tscn::PackedScene::6815695514927101566::1678176168::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k +upgrades.tscn::PackedScene::5871013436024621816::1678176168::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k +::res://Scripts/::1678176067 Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>:: -game_world.gd::GDScript::-1::1678090225::0::1::::<>Node2D<>:: -horse.gd::GDScript::-1::1678073658::0::1::::<>CharacterBody2D<>:: -ingame_ui.gd::GDScript::-1::1678059546::0::1::::<>CanvasLayer<>:: +game_world.gd::GDScript::-1::1678176067::0::1::::<>Node2D<>:: +horse.gd::GDScript::-1::1678175992::0::1::::<>CharacterBody2D<>:: +ingame_ui.gd::GDScript::-1::1678173250::0::1::::<>CanvasLayer<>:: PlayArea.gd::GDScript::-1::1678064613::0::1::::<>Area2D<>:: -upgrades.gd::GDScript::-1::1678074136::0::1::::<>CanvasLayer<>:: +upgrades.gd::GDScript::-1::1678175992::0::1::::<>CanvasLayer<>:: varConst.gd::GDScript::-1::1677895026::0::1::::<>Node<>:: varVar.gd::GDScript::-1::1678066992::0::1::::<>Node<>:: ::res://Scripts/Cupcakes/::1678073658 diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index c447408..bb27844 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,7 +1,15 @@ -res://Scenes/game_world.tscn +res://Scenes/UI/upgrades.tscn res://Scripts/game_world.gd +res://Scripts/ingame_ui.gd +res://Scenes/game_world.tscn res://Scenes/horse.tscn res://Scenes/Cupcakes/cupcake.tscn res://Scenes/Locations/yard.tscn -res://Scenes/UI/upgrades.tscn res://Scenes/UI/ingame_ui.tscn +res://Scripts/upgrades.gd +res://Scripts/horse.gd +res://Scenes/Cupcakes/chocCupcake.tscn +res://Scenes/Cupcakes/strawCupcake.tscn +res://Scripts/Cupcakes/chocCupcake.gd +res://Scripts/Cupcakes/cupcake.gd +res://Scripts/Cupcakes/strawCupcake.gd diff --git a/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg b/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg index ce4a74e..0b22a3e 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(-185.733, -267.442), +"ofs": Vector2(-27, -255), "primary_grid_steps": 8, "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.66742 +"zoom": 1.0 } 3D={ "fov": 70.01, diff --git a/.godot/editor/game_world.tscn-folding-bdbf2ba254a2078c85b005689e1549ff.cfg b/.godot/editor/game_world.tscn-folding-bdbf2ba254a2078c85b005689e1549ff.cfg index 04294d1..fa464b3 100644 --- a/.godot/editor/game_world.tscn-folding-bdbf2ba254a2078c85b005689e1549ff.cfg +++ b/.godot/editor/game_world.tscn-folding-bdbf2ba254a2078c85b005689e1549ff.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform", "Material", "Texture", "Ordering", "Visibility", "Editor Description", "Process", "ccVanilla"), NodePath("Location"), PackedStringArray("Visibility"), NodePath("Upgrades"), PackedStringArray("Layer"), NodePath("Cupcakes/Cupcake"), PackedStringArray("Collision"), NodePath("PlayArea"), PackedStringArray("Input", "Collision", "Visibility"), NodePath("PlayArea/CollisionShape2D"), PackedStringArray("Transform", "shape")] +node_unfolds=[NodePath("."), PackedStringArray("Transform", "Material", "Texture", "Ordering", "Visibility", "Editor Description", "Process", "ccVanilla"), NodePath("Location"), PackedStringArray("Visibility"), NodePath("Upgrades"), PackedStringArray("Layer"), NodePath("PlayArea"), PackedStringArray("Input", "Collision", "Visibility"), NodePath("PlayArea/CollisionShape2D"), PackedStringArray("Transform", "shape")] resource_unfolds=["res://Scenes/game_world.tscn::RectangleShape2D_g5fj2", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 6e91235..3ccadf2 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/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/y.tscn", "res://Scenes/Locations/Yard.tscn", "res://Scenes/cupcake.tscn"] -scripts=["Node", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/upgrades.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/game_world.gd"] +scenes=["res://Scenes/Cupcakes/strawCupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/y.tscn"] +scripts=["res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "Node", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/upgrades.gd", "res://Scripts/PlayArea.gd", "res://README.md"] [script_setup] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 498b226..e6be3ad 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,3 +1,4 @@ +res://Scripts/Cupcakes /home/shobie/CupcakeRevolution1/Linux /bin /home/shobie/CupcakeRevolution1 @@ -7,7 +8,6 @@ res://Scenes/UI res://Scripts res://Scenes/Locations res://Art/Locations -res://Scripts/Cupcakes res://Art res://Scenes res:// diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index fd87261..554e289 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -3,10 +3,10 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 21, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 17, +"row": 3, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -20,8 +20,8 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 113, -"scroll_position": 0.0, +"row": 128, +"scroll_position": 173.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -45,16 +45,12 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 74, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 7, +"row": 5, "scroll_position": 0.0, -"selection": true, -"selection_from_column": 0, -"selection_from_line": 7, -"selection_to_column": 15, -"selection_to_line": 7, +"selection": false, "syntax_highlighter": "GDScript" } @@ -94,13 +90,9 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 21, -"scroll_position": 0.0, -"selection": true, -"selection_from_column": 0, -"selection_from_line": 21, -"selection_to_column": 28, -"selection_to_line": 22, +"row": 31, +"scroll_position": 13.0, +"selection": false, "syntax_highlighter": "GDScript" } @@ -109,7 +101,7 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 10, +"column": 2, "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 24, @@ -118,7 +110,7 @@ state={ "syntax_highlighter": "GDScript" } -[res://Scripts/varVar.gd] +[res://Scripts/Cupcakes/chocCupcake.gd] state={ "bookmarks": PackedInt32Array(), @@ -126,25 +118,21 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 4, +"row": 9, "scroll_position": 0.0, -"selection": true, -"selection_from_column": 0, -"selection_from_line": 4, -"selection_to_column": 17, -"selection_to_line": 5, +"selection": false, "syntax_highlighter": "GDScript" } -[res://Scripts/varConst.gd] +[res://Scripts/Cupcakes/strawCupcake.gd] state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 76, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 5, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 54b395f98a2dbe1c055f8c4087c8d3e665933a8a..ab6c11ba5ce683f2761fc8e55765833d4ec06f8c 100644 GIT binary patch delta 414 zcmey*bdHTtU?XE4V||Fs9Y0kIab6z=28N>4Vk>?9pwyhy#NyOq{qWQz{W1fEu+*aB z%=|ossMMl-edp4Gxnivv7jI)RktL+G&w^TW{IY(nMQv z@r?XrsE0B~Kig2em7L~w)t5`oQF%QWg b`5nx=wr`BmR-ZUQQn0wBD6t$S2{H-*SRay9 delta 10 RcmX@d_MeH7b0cFNBLEah0}%iK diff --git a/Art/Cupcakes/ChocCupcake.png b/Art/Cupcakes/ChocCupcake.png new file mode 100644 index 0000000000000000000000000000000000000000..1e46f77b5947b6d6fac79afedc169124542ab0fc GIT binary patch literal 990 zcmV<410np0P)Px&m`OxIR7i>4m0NDyHWY?Gij*|cNUrU~v0)TRfII{!+6@%wL$}b?W(CEDJp>K0guhn*p8rMgeR5flA>?T8ps5)6jf;ao9U)(pJjd>3d=Y$JB9)uJ zGilMZWHdzHlJIyGzUp{6?sE2m?;E5J$5{0NTSCg`{=-*EU%bMN6cX;pbnq}7zEfoBs+@FOGHQT)n^K&L32!o0ra{vq9_>o6K{Hw zhL?83+X6qpNW~c$#jLOzi3W-Z$^b~a&gw`v1Vsgs49^K_uN4tX#FEj_jK@SS=-UC^ z&%mHJu|=HU;{po1&DjF`Dxk*|8qh4rDAAnJbbr&g0|1kPdJUWeBtbHO1xMWV_yI`G zLoV89WFATjMp_gWQ4TFfWE@?4oEQl7DD@G5pde(B3V1o7)Om{-3#D5EHHMmug7@vO zR9%C?gSxTK8|@Pmz=VQ?n`=cd5Y!5=1YQw&&$6o++a8o9!S$0#ef=GPNzc$SWR&5X zZ7UugBHqp$U<8m^z02O>i`f>KYlKOV2_%^X`Dz}^N6^8L2)qE50X(}zecv8)aSE#f zCbJ^Zu}m3D3#kTM%m7=$Sb<&6epX#c+nu0-;oi}AJUToCZj{ZR%DcG3S;bgQbS5#> zAP(~NrBMI^DuG0}Jg`&?&7;GX zPhNl6y?Mjy6&FTvbf>0l7L?6`eJxmzj1GSpkdP>Ijq4-GrWkE`{N&ArqIX2=k;%^h z>+zQ>g7t*Slh*1@U7{8Rg~<>F)~7lDrpKRJ*LjL+LMad>C^AF@$E^5-x78 zu$|%-XKy`rF;W_hLScQ_c&jzuCv1q=E|Q@TE!b7Wy6u|03r<4!*5T@TC@Eo4YuqZ~ zBvCXQ_onHyNsH~$zW3MkIpD3oPUtP8OcK8#>P%`*2qy?XQYf9dT>PNa8+&Ut=M?{3Ze2NSx+imX|OA^-pY M07*qoM6N<$f)zK;pa1{> literal 0 HcmV?d00001 diff --git a/Art/Cupcakes/ChocCupcake.png.import b/Art/Cupcakes/ChocCupcake.png.import new file mode 100644 index 0000000..34203ef --- /dev/null +++ b/Art/Cupcakes/ChocCupcake.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bnr06vojcqkqy" +path="res://.godot/imported/ChocCupcake.png-e006e5de377232b1b1c50df2e20e22a7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Cupcakes/ChocCupcake.png" +dest_files=["res://.godot/imported/ChocCupcake.png-e006e5de377232b1b1c50df2e20e22a7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Art/Cupcakes/VanCupcake.png b/Art/Cupcakes/VanCupcake.png new file mode 100644 index 0000000000000000000000000000000000000000..79c21b883f5187f504086188a6053c59b944ec53 GIT binary patch literal 1070 zcmV+}1kwA6P)Px&=t)FDR7i>4mQ83}RTRg6=id29GG;nyi`G&?X(>oSMBAdIwn!Ff3ohIhT%=vO z=&DQYO0*Q0uEd248^lFX6gN#{ks?$`kt$+W@dLEb8VULSn)mMcyLi(i(}_*p`rs|z zymNl%fB)y)`v(5^*Y!(hb^ZKVZ53DgFVHJjhvoMLwsq{5Ay=*rt8w3;1~a{)F>k0_ zWMz2u6?$68 z=85Aqj(uICdNaTzjE)X(>i4GAu6;GEcs<}R3$Kg0R%+kEx(-PY!G1G5cTT+3Zp)_4 zQw6*(Y|JR-#twS$Cl~Q!j+fy^a*oA71R_BBF%*xE4$Cr_Ep1Tv(*uvg21*9>kao?X zqe5jkxuKbD;IR+RDBLoPh#$yFhYB0EIfSJEw_AZP0BW~Z5%>#+&K1qDF@0DxBzPXwy$%e^g|56V;$r*a+rVj`h?8I?!zRJzBK9lvku!a`0N!!uNGvRh zWnsX)paJ-XqHATwK0Tv27MVJoQ#S~6hW%jJZqP2U@4%+xn#W=V^$7+Fgo02-co|Ne z95MT1bXYxtFdpD8gxr7%Q>T|{+%RmH!JdZ=d&s^P6u^Elc&fEQl7S8iwu2uMs;|;_ z+n9Mp1yowQZDRdd65i#gBEpmrzFGI#0KObMqb?U=(J(i-1Kb6j5?&KwuC?55VNJsl zCHvYW4nNVm5kpuD+MgRH(?G6M4gF_Bv!DG>zF(u|#W)lL6l!OvF8X z)cX4=AJ00+&6gb%d1J?c_Qqr)o6hhVXXnH+09^yyDD5aT4W%KUZhpzEBLBN&1_>Bp*vEp*6>ip^Ht1O0LT|I1_s~l+<9qn0W-rYT_{!|Rte?K zv(-EUngq`=1R(RW`-n;Chj7wX1sLt?KNJ< zS&=VgRN^X*03l*a$x5Lk7zQW__q3MhtEr8%>3Qs)2q6H5d%o^%2*`!I<5|LFC<= ccVanPrice: - ccSpawnRate += 1 + ccVanSpawnRate += 1 ccVanNum -= ccVanPrice ccVanPrice = ccVanPrice * 1.3 - $Upgrades/Control/ScrollContainer/VanGrid/VanUp1/Price.text = str(ccVanPrice) + $Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice) collectCupcakes() @@ -101,7 +189,7 @@ func _on_upgrades_faster_cupcake(): ccVanNum -= ccVanPrice2 ccVanPrice2 = ccVanPrice2 * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/ScrollContainer/VanGrid/VanUp2/Price.text = str(ccVanPrice2) + $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2) collectCupcakes() func _on_upgrades_condensed_cupcake_1(): @@ -109,5 +197,45 @@ func _on_upgrades_condensed_cupcake_1(): ccVanNum -= ccVanPrice3 ccVanPrice3 = ccVanPrice3 * 1.3 ccVanValue += 1 - $Upgrades/Control/ScrollContainer/VanGrid/VanUp3/Price.text = str(ccVanPrice3) + $Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccVanPrice3) collectCupcakes() + +#Unlock +func _on_upgrades_unlock_choc(): + if ccVanNum >= ccVanPrice4: + ccVanNum -= ccVanPrice4 + ccChocLocked = false + $"InGameUI/Main/HBoxContainer/Choc".visible = true + $"InGameUI/Num/GridContainer/chocIcon".visible = true + $"InGameUI/Num/GridContainer/ccChocNum".visible = true + $"Upgrades/Control/VanScroll/VanGrid/VanUp4/Buy".visible = false + +func _on_upgrades_unlock_straw(): + if ccChocNum >= ccChocPrice4: + ccChocNum -= ccChocPrice4 + ccStrawLocked = false + $"InGameUI/Main/HBoxContainer/Straw".visible = true + $"InGameUI/Num/GridContainer/strawIcon".visible = true + $"InGameUI/Num/GridContainer/ccStrawNum".visible = true + $"Upgrades/Control/ChocScroll/ChocGrid/ChocUp4/Buy".visible = false + +#Collect +func _on_van_cupcake_cc_van_collected(): + ccVanNum += ccVanValue + ccCount -= 1 + collectCupcakes() + + +func _on_choc_cupcake_cc_choc_collected(): + ccChocNum += ccChocValue + ccCount -= 1 + collectCupcakes() + + +func _on_straw_cupcake_cc_straw_collected(): + ccStrawNum += ccStrawValue + ccCount -= 1 + collectCupcakes() + + + diff --git a/Scripts/horse.gd b/Scripts/horse.gd index c7bcf24..5948da8 100644 --- a/Scripts/horse.gd +++ b/Scripts/horse.gd @@ -1,19 +1,8 @@ extends CharacterBody2D -var horse_instance var mouse_position = Vector2.ZERO -var blower -#ccScore -var ccVanNum = 0 -var ccChocNum = 0 -var ccStrawNum = 0 -var ccBlueNum = 0 -var ccRVelNum = 0 - - - -signal hit +signal hit() func _process(delta): mouse_position = lerp(mouse_position, get_global_mouse_position(), 0.02) diff --git a/Scripts/ingame_ui.gd b/Scripts/ingame_ui.gd index 25a9b58..eb9b504 100644 --- a/Scripts/ingame_ui.gd +++ b/Scripts/ingame_ui.gd @@ -1,6 +1,8 @@ extends CanvasLayer @onready var upgrades = $"../Upgrades" +@onready var vanUp = $"../Upgrades/Control/VanScroll" +@onready var chocUp = $"../Upgrades/Control/ChocScroll" # Called when the node enters the scene tree for the first time. func _ready(): @@ -13,13 +15,21 @@ func _process(delta): func _on_van_pressed(): - if upgrades.visible == false: - upgrades.visible = true + if vanUp.visible == false: + vanUp.visible = true + chocUp.visible = false else: - upgrades.visible = false + if upgrades.visible == false: + upgrades.visible = true + else: + upgrades.visible = false func _on_choc_pressed(): - if upgrades.visible == false: - upgrades.visible = true + if vanUp.visible == true: + vanUp.visible = false + chocUp.visible = true else: - upgrades.visible = false + if upgrades.visible == false: + upgrades.visible = true + else: + upgrades.visible = false diff --git a/Scripts/upgrades.gd b/Scripts/upgrades.gd index f177703..a92d081 100644 --- a/Scripts/upgrades.gd +++ b/Scripts/upgrades.gd @@ -1,19 +1,34 @@ extends CanvasLayer +#Vanilla signal oneMoreCupcake() signal fasterCupcake() signal condensedCupcake1() - - - - -func _ready(): - pass # Replace with function body. - +signal unlockChoc() +#Chocolate +signal oneMoreCupcake2() +signal fasterCupcake2() +signal condensedCupcake2() +signal unlockStraw() +#Strawberry +signal oneMoreCupcake3() +signal fasterCupcake3() +signal condensedCupcake3() +signal unlockRVel() +#Red Velvet +signal oneMoreCupcake4() +signal fasterCupcake4() +signal condensedCupcake4() +signal unlockCin() +#Cinnamon +signal oneMoreCupcake5() +signal fasterCupcake5() +signal condensedCupcake5() +#Nightmare +signal unlockNightmare() func _on_close_pressed(): self.visible = false - func _on_buy_pressed(): @@ -26,3 +41,23 @@ func _on_buy_van2_pressed(): func _on_buy_van3_pressed(): emit_signal("condensedCupcake1") + + +func _on_buy_van4_pressed(): + emit_signal("unlockChoc") + + +func _on_buy_choc1_pressed(): + emit_signal("oneMoreCupcake2") + + +func _on_buy_choc2_pressed(): + emit_signal("fasterCupcake2") + + +func _on_buy_choc3_pressed(): + emit_signal("condensedCupcake2") + + +func _on_buy_choc4_pressed(): + emit_signal("unlockStraw") diff --git a/Scripts/varConst.gd b/Scripts/varConst.gd deleted file mode 100644 index e08925d..0000000 --- a/Scripts/varConst.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Node - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass diff --git a/Scripts/varVar.gd b/Scripts/varVar.gd deleted file mode 100644 index f870c53..0000000 --- a/Scripts/varVar.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node - -var location - -var ccVanNum = 0 -var ccChocNum = 0