From 5e84f9c37d83ff619ebe31489f1138e05b845dfe Mon Sep 17 00:00:00 2001 From: OnlyMares Date: Sun, 12 Mar 2023 05:01:41 -0500 Subject: [PATCH] Pre Alpha 0.1 Fuck AI --- .godot/editor/editor_layout.cfg | 4 +- .godot/editor/filesystem_cache8 | 54 +++-- .godot/editor/filesystem_update4 | 13 +- ...state-bdbf2ba254a2078c85b005689e1549ff.cfg | 4 +- .godot/editor/project_metadata.cfg | 10 +- .godot/editor/recent_dirs | 5 +- .godot/editor/script_editor_cache.cfg | 28 +-- .godot/uid_cache.bin | Bin 1134 -> 1176 bytes Art/Tools/bakingTray.png | Bin 0 -> 13728 bytes Art/Tools/bakingTray.png.import | 34 ++++ Scenes/Cupcakes/chocCupcake.tscn | 4 +- Scenes/Cupcakes/cinCupcake.tscn | 2 +- Scenes/Cupcakes/cupcake.tscn | 3 +- Scenes/Cupcakes/honCupcake.tscn | 2 +- Scenes/Cupcakes/nightCupcake.tscn | 2 +- Scenes/Cupcakes/rvelCupcake.tscn | 2 +- Scenes/Cupcakes/strawCupcake.tscn | 2 +- Scenes/Tools/bakingTray.tscn | 10 +- Scenes/Tools/hooves.tscn | 2 + Scripts/game_world.gd | 188 +++++++----------- Scripts/ingame_ui.gd | 22 +- export_presets.cfg | 6 +- project.godot | 3 + 23 files changed, 205 insertions(+), 195 deletions(-) create mode 100644 Art/Tools/bakingTray.png create mode 100644 Art/Tools/bakingTray.png.import diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index fb6fe08..231e81a 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -14,11 +14,11 @@ dock_split_1=0 dock_split_4=0 dock_2="FileSystem" dock_3="Scene,Import" -dock_5="Inspector,Node,History,Commit (40)" +dock_5="Inspector,Node,History,Commit (16)" [EditorNode] -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"] +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/Locations/neighYard.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Tools/hooves.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn"] [ScriptEditor] diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 1c4691d..663d507 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ 2a60927148abd1d33b818b535e306557 -::res://::1678400171 +::res://::1678564628 export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>:: ::res://addons/::1677750379 @@ -10,10 +10,10 @@ THIRDPARTY.md::TextFile::-1::1677750379::0::1::::<><>:: ::res://addons/godot-git-plugin/linux/::1677750379 ::res://addons/godot-git-plugin/macos/::1677750379 ::res://addons/godot-git-plugin/win64/::1677750379 -::res://Art/::1677787260 +::res://Art/::1678613770 ::res://Art/Characters/::1677787257 defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>:: -::res://Art/Cupcakes/::1678488712 +::res://Art/Cupcakes/::1678488729 ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>:: CinCupcake.png::CompressedTexture2D::6767289867738545589::1678488310::1678488729::1::::<><>:: Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>:: @@ -23,6 +23,8 @@ RVelCupcake.png::CompressedTexture2D::4611357256445777224::1678488250::167848872 VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>:: ::res://Art/Locations/::1677787260 yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: +::res://Art/Tools/::1678613786 +bakingTray.png::CompressedTexture2D::5691511711123151312::1678613786::1678613792::1::::<><>:: ::res://Art/Upgrades/::1677787246 ::res://Releases/::1678095890 ::res://Releases/Linux/::1678096050 @@ -32,26 +34,42 @@ 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/::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 +::res://Scenes/::1678613354 +game_world.tscn::PackedScene::7981802964863433317::1678613353::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<>uid://bh3snjiwx8l0v<>uid://c373r4pv46ydj<>uid://ciciat7jdjboy<>uid://bptnammqx5dk2 +horse.tscn::PackedScene::8568825373134700876::1678613354::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke +::res://Scenes/Cupcakes/::1678613354 chocCupcake.tscn::PackedScene::5843790513687768897::1678400136::0::1::::<><>::res://Scripts/Cupcakes/chocCupcake.gd<>uid://bnr06vojcqkqy +cinCupcake.tscn::PackedScene::6805921059018230263::1678613354::0::1::::<><>::res://Scripts/Cupcakes/cinCupcake.gd<>uid://c3oejmmv6ysxp cupcake.tscn::PackedScene::8468695979515826288::1678400136::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://brpc5ocwgd8ls -strawCupcake.tscn::PackedScene::3124004694192797727::1678400136::0::1::::<><>::res://Scripts/Cupcakes/strawCupcake.gd<>uid://7fqro4fugv8k -::res://Scenes/Locations/::1678400136 +honCupcake.tscn::PackedScene::5338967655731389712::1678613354::0::1::::<><>::res://Scripts/Cupcakes/honCupcake.gd<>uid://dc43quvhcwa8e +nightCupcake.tscn::PackedScene::3479266486073426779::1678613354::0::1::::<><>::res://Scripts/Cupcakes/nightCupcake.gd<>uid://0vm8bhbkhqym +rvelCupcake.tscn::PackedScene::2936661773563773771::1678613354::0::1::::<><>::res://Scripts/Cupcakes/rvelCupcake.gd<>uid://b6x1m6u01x377 +strawCupcake.tscn::PackedScene::3124004694192797727::1678613354::0::1::::<><>::res://Scripts/Cupcakes/strawCupcake.gd<>uid://7fqro4fugv8k +::res://Scenes/Locations/::1678613354 +neighYard.tscn::PackedScene::633631167704521406::1678613354::0::1::::<><>::uid://b3j662tj6h5vq yard.tscn::PackedScene::7883941411178408831::1678400136::0::1::::<><>::uid://b3j662tj6h5vq -::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 +::res://Scenes/Tools/::1678613354 +bakingTray.tscn::PackedScene::6954382797642648543::1678613354::0::1::::<><>::uid://0vm8bhbkhqym<>res://Scripts/Tools/bakingTray.gd +hooves.tscn::PackedScene::7567573654608928774::1678613354::0::1::::<><>::res://Scripts/Tools/hooves.gd +tool.tscn::PackedScene::1367248170788127558::1678501723::0::1::::<><>:: +::res://Scenes/UI/::1678613354 +ingame_ui.tscn::PackedScene::6815695514927101566::1678613354::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy<>uid://b6x1m6u01x377<>uid://c3oejmmv6ysxp<>uid://dc43quvhcwa8e<>uid://0vm8bhbkhqym +upgrades.tscn::PackedScene::5871013436024621816::1678613353::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy<>uid://b6x1m6u01x377<>uid://c3oejmmv6ysxp<>uid://dc43quvhcwa8e +::res://Scripts/::1678613256 Cupcake Spawn Timer.gd::GDScript::-1::1678186507::0::1::::<>Timer<>:: -game_world.gd::GDScript::-1::1678487495::0::1::::<>Node2D<>:: -horse.gd::GDScript::-1::1678184579::0::1::::<>CharacterBody2D<>:: -ingame_ui.gd::GDScript::-1::1678443815::0::1::::<>CanvasLayer<>:: +game_world.gd::GDScript::-1::1678613256::0::1::::<>Node2D<>:: +horse.gd::GDScript::-1::1678505240::0::1::::<>CharacterBody2D<>:: +ingame_ui.gd::GDScript::-1::1678611212::0::1::::<>CanvasLayer<>:: PlayArea.gd::GDScript::-1::1678186507::0::1::::<>Area2D<>:: -upgrades.gd::GDScript::-1::1678443115::0::1::::<>CanvasLayer<>:: -::res://Scripts/Cupcakes/::1678180708 +upgrades.gd::GDScript::-1::1678502949::0::1::::<>CanvasLayer<>:: +::res://Scripts/Cupcakes/::1678494053 chocCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: +cinCupcake.gd::GDScript::-1::1678494053::0::1::::<>RigidBody2D<>:: cupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: +honCupcake.gd::GDScript::-1::1678490256::0::1::::<>RigidBody2D<>:: +nightCupcake.gd::GDScript::-1::1678490280::0::1::::<>RigidBody2D<>:: +rvelCupcake.gd::GDScript::-1::1678494048::0::1::::<>RigidBody2D<>:: strawCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: +::res://Scripts/Tools/::1678505240 +bakingTray.gd::GDScript::-1::1678505161::0::1::::<>RigidBody2D<>:: +hooves.gd::GDScript::-1::1678505240::0::1::::<>RigidBody2D<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 2c399e2..982c2ec 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -2,20 +2,15 @@ res://Scenes/game_world.tscn res://Scripts/game_world.gd 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/rvelCupcake.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 +res://Scripts/ingame_ui.gd +res://Scenes/Cupcakes/chocCupcake.tscn +res://Scenes/Cupcakes/cupcake.tscn diff --git a/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg b/.godot/editor/game_world.tscn-editstate-bdbf2ba254a2078c85b005689e1549ff.cfg index dfaef07..af9fbc2 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(-329.938, -390.646), +"ofs": Vector2(-122.834, -146.945), "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.594604 +"zoom": 0.749154 } 3D={ "fov": 70.01, diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index c2ae31f..952b0aa 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -13,16 +13,16 @@ run_reload_scripts=true project_settings=Rect2(814, 520, 1120, 920) editor_settings=Rect2(830, 610, 900, 700) search_help=Rect2(640, 390, 1280, 720) -export=Rect2(830, 640, 900, 700) +export=Rect2(830, 700, 900, 700) [color_picker] -recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.0927669, 0.215293, 1, 0.163438, 0.106064, 0.177906, 1, 0.151073, 0.10726, 0.20049, 1, 0.169037, 0.0963807, 0.200651, 1, 0.159178, 0.105531, 0.189929, 1, 0.722336, 0.665569, 0.997871, 1, 0.0110876, 0.0110876, 0.0110876, 1, 0.0562916, 0.0562916, 0.0562916, 1) +recent_presets=PackedColorArray(0.163438, 0.106064, 0.177906, 1, 0.151073, 0.10726, 0.20049, 1, 0.169037, 0.0963807, 0.200651, 1, 0.159178, 0.105531, 0.189929, 1, 0.722336, 0.665569, 0.997871, 1, 0.0110876, 0.0110876, 0.0110876, 1, 0.0562916, 0.0562916, 0.0562916, 1, 0.248191, 0.0296674, 0.206438, 1, 0.975717, 0.874132, 0.94369, 1) [recent_files] -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"] +scenes=["res://Scenes/Cupcakes/chocCupcake.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Tools/hooves.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Locations/neighYard.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=["Node", "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"] [script_setup] @@ -34,7 +34,7 @@ advanced_mode=true [export_options] -default_filename="CupcakeRevolutionVersionZero" +default_filename="CupcakeRevolution-AlmostV0.1-Linux" [scripts_panel] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index ef27cce..5975915 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,13 +1,14 @@ +/home/shobie/CupcakeRevolution1/Linux +/home/shobie/CupcakeRevolution1/Windows +res://Art/Cupcakes 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://Art/Locations diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 9daa631..4182d9c 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,12 +17,16 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"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]), +"column": 0, +"folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 581, -"scroll_position": 120.0, -"selection": false, +"row": 497, +"scroll_position": 209.0, +"selection": true, +"selection_from_column": 0, +"selection_from_line": 497, +"selection_to_column": 14, +"selection_to_line": 517, "syntax_highlighter": "GDScript" } @@ -87,10 +91,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 25, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 116, +"row": 81, "scroll_position": 68.0, "selection": false, "syntax_highlighter": "GDScript" @@ -101,11 +105,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 8, +"column": 2, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 111, -"scroll_position": 67.0, +"row": 115, +"scroll_position": 50.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -213,10 +217,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 24, +"column": 21, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 8, +"row": 6, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 70bc5a12088c39c2eee0166c57bd18940c9026bf..e0aa6c78fed830e3eec8a76b42a49ba7c33dc599 100644 GIT binary patch delta 132 zcmV-~0DJ%L2$%^08j%5ElgR=tkzy*7oB}PAZ2~WoKLRe1jEIvc12K~n0WOnS17rzH z!@TZN9>FLklQ9DslNbXKlR^PAljQ?3lXU?slRyM6lNJOjlf45dlc52gD$tpD5Wi3S mP96XN0CHt>IxjCla&#|LZ*OdKFJfV9X>Mm!a$$KcaBgQd_be6w delta 87 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 NvVyvNm8^N_{{UD3jqd;e literal 0 HcmV?d00001 diff --git a/Art/Tools/bakingTray.png.import b/Art/Tools/bakingTray.png.import new file mode 100644 index 0000000..bd16454 --- /dev/null +++ b/Art/Tools/bakingTray.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cndampqx57ed1" +path="res://.godot/imported/bakingTray.png-33a1c6a36a62772510594ecd7feff3bb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Tools/bakingTray.png" +dest_files=["res://.godot/imported/bakingTray.png-33a1c6a36a62772510594ecd7feff3bb.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/chocCupcake.tscn b/Scenes/Cupcakes/chocCupcake.tscn index f313fab..396e788 100644 --- a/Scenes/Cupcakes/chocCupcake.tscn +++ b/Scenes/Cupcakes/chocCupcake.tscn @@ -8,9 +8,9 @@ radius = 10.5119 [node name="ChocCupcake" type="RigidBody2D"] collision_layer = 2 -inertia = 0.17 +inertia = 5.86 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 1.0 script = ExtResource("1_fnewv") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/cinCupcake.tscn b/Scenes/Cupcakes/cinCupcake.tscn index 89e2c12..61743f8 100644 --- a/Scenes/Cupcakes/cinCupcake.tscn +++ b/Scenes/Cupcakes/cinCupcake.tscn @@ -10,7 +10,7 @@ radius = 10.5119 collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 1.3 script = ExtResource("1_36k3s") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/cupcake.tscn b/Scenes/Cupcakes/cupcake.tscn index 3feaa1c..06fec86 100644 --- a/Scenes/Cupcakes/cupcake.tscn +++ b/Scenes/Cupcakes/cupcake.tscn @@ -8,9 +8,8 @@ radius = 10.5119 [node name="VanCupcake" type="RigidBody2D"] collision_layer = 2 -inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 1.0 script = ExtResource("1_2fcqt") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/honCupcake.tscn b/Scenes/Cupcakes/honCupcake.tscn index a5354e1..1cc347d 100644 --- a/Scenes/Cupcakes/honCupcake.tscn +++ b/Scenes/Cupcakes/honCupcake.tscn @@ -10,7 +10,7 @@ radius = 10.5119 collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 2.0 script = ExtResource("1_pnosq") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/nightCupcake.tscn b/Scenes/Cupcakes/nightCupcake.tscn index 915fbc6..eb35571 100644 --- a/Scenes/Cupcakes/nightCupcake.tscn +++ b/Scenes/Cupcakes/nightCupcake.tscn @@ -10,7 +10,7 @@ radius = 10.5119 collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 10.0 script = ExtResource("1_o16jw") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/rvelCupcake.tscn b/Scenes/Cupcakes/rvelCupcake.tscn index 79d9e0d..1110bc8 100644 --- a/Scenes/Cupcakes/rvelCupcake.tscn +++ b/Scenes/Cupcakes/rvelCupcake.tscn @@ -10,7 +10,7 @@ radius = 10.5119 collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 1.2 script = ExtResource("1_q06vq") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Cupcakes/strawCupcake.tscn b/Scenes/Cupcakes/strawCupcake.tscn index 3d2f0ed..bbb1789 100644 --- a/Scenes/Cupcakes/strawCupcake.tscn +++ b/Scenes/Cupcakes/strawCupcake.tscn @@ -10,7 +10,7 @@ radius = 10.5119 collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 -linear_damp = 6.0 +linear_damp = 1.1 script = ExtResource("1_qw0j6") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scenes/Tools/bakingTray.tscn b/Scenes/Tools/bakingTray.tscn index 4b4053b..c72cb58 100644 --- a/Scenes/Tools/bakingTray.tscn +++ b/Scenes/Tools/bakingTray.tscn @@ -1,18 +1,22 @@ [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"] +[ext_resource type="Texture2D" uid="uid://cndampqx57ed1" path="res://Art/Tools/bakingTray.png" id="2_j25b1"] [sub_resource type="CircleShape2D" id="CircleShape2D_nw58x"] -radius = 113.004 +radius = 175.103 [node name="Tool" type="RigidBody2D"] +disable_mode = 2 collision_layer = 3 collision_mask = 3 +freeze = true +freeze_mode = 1 script = ExtResource("1_x6kvb") [node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("1_rcylv") +position = Vector2(-117, 64) +texture = ExtResource("2_j25b1") offset = Vector2(0, -64) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/Scenes/Tools/hooves.tscn b/Scenes/Tools/hooves.tscn index b8b440b..ce4349c 100644 --- a/Scenes/Tools/hooves.tscn +++ b/Scenes/Tools/hooves.tscn @@ -8,6 +8,8 @@ radius = 68.0661 [node name="Tool" type="RigidBody2D"] collision_layer = 3 collision_mask = 3 +freeze = true +freeze_mode = 1 script = ExtResource("1_o1lbx") [node name="Sprite2D" type="Sprite2D" parent="."] diff --git a/Scripts/game_world.gd b/Scripts/game_world.gd index d56cab6..2003163 100644 --- a/Scripts/game_world.gd +++ b/Scripts/game_world.gd @@ -72,7 +72,7 @@ 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 = preload("res://Scenes/Cupcakes/rvelCupcake.tscn") -var ccCinnamon = preload("res://Scenes/Cupcakes/cupcake.tscn") +var ccCinnamon = preload("res://Scenes/Cupcakes/cinCupcake.tscn") var ccHonest = preload("res://Scenes/Cupcakes/honCupcake.tscn") var ccNightmare = preload("res://Scenes/Cupcakes/nightCupcake.tscn") var ccRock @@ -84,8 +84,12 @@ var ccLoyal var ccChaos #Areas -var yourYard = preload("res://Scenes/Locations/yard.tscn") -var neighYard = preload("res://Scenes/Locations/neighYard.tscn") +var location = null +const AREA_PATHS = [ + "res://Scenes/Locations/yard.tscn", + "res://Scenes/Locations/neighYard.tscn" +] +var areaScenes = [] #Area Locks var neighYardLocked = true @@ -141,11 +145,12 @@ 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() +var tool = null +const TOOL_PATHS = [ + "res://Scenes/Tools/hooves.tscn", + "res://Scenes/Tools/bakingTray.tscn" +] +var toolScenes = [] #Other @onready var timer = get_node("Cupcake Spawn Timer") @@ -155,16 +160,22 @@ var horseScene var mouse_position = Vector2.ZERO var ccCount = 0 var ccMaxOnScreen = 3000 -var location - #General func _ready(): + for path in AREA_PATHS: + var scene = load(path) + var instance = scene.instantiate() + areaScenes.append(instance) horse_instance = horse_scene.instantiate() add_child(horse_instance) - location = yourYard + location = areaScenes[0] spawnHorse() - tool = toolHoovesScene + for path in TOOL_PATHS: + var scene = load(path) + var instance = scene.instantiate() + toolScenes.append(instance) + tool = toolScenes[0] add_child(tool) @@ -174,22 +185,22 @@ func _process(delta): horse_instance.position = mouse_position 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 + +func _input(event): + if event is InputEventMouseButton and event.pressed: + 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) + if $Location.get_child_count() >= 1: + $Location.remove_child(location) + $Location.add_child(location) #Tool Refresh func toolRefresh(): @@ -207,86 +218,30 @@ func collectCupcakes(): #Cupcake Timer func _on_timeout(): - spawnVanCupcakes() - if ccChocLocked == false: - spawnChocCupcakes() - if ccStrawLocked == false: - spawnStrawCupcakes() - if ccRVelLocked == false: - spawnRVelCupcakes() - if ccCinLocked == false: - spawnCinCupcakes() + spawnCupcakes(ccVan, ccVanSpawnRate) + if not ccChocLocked: + spawnCupcakes(ccChoc, ccChocSpawnRate) + if not ccStrawLocked: + spawnCupcakes(ccStraw, ccStrawSpawnRate) + if not ccRVelLocked: + spawnCupcakes(ccRVel, ccRVelSpawnRate) + if not ccCinLocked: + spawnCupcakes(ccCin, ccCinSpawnRate) collectCupcakes() - timer.start + timer.start() #Spawn -func spawnVanCupcakes(): - var randX - var randY - randomize() - if ccCount <= ccMaxOnScreen: - for i in range(ccVanSpawnRate): - randX = randi_range(50, 1870) - randY = randi_range(50, 1030) - ccVan.position = Vector2(randX, randY) - $Cupcakes.add_child(ccVan.duplicate()) - ccCount = ccCount + ccVanSpawnRate - -func spawnChocCupcakes(): - var randX - var randY - randomize() - if ccCount <= ccMaxOnScreen: - for i in range(ccChocSpawnRate): - randX = randi_range(50, 1870) - randY = randi_range(50, 1030) - ccChoc.position = Vector2(randX, randY) - $Cupcakes.add_child(ccChoc.duplicate()) - ccCount = ccCount + ccChocSpawnRate - -func spawnStrawCupcakes(): - var randX - var randY - randomize() - if ccCount <= ccMaxOnScreen: - for i in range(ccStrawSpawnRate): - randX = randi_range(50, 1870) - randY = randi_range(50, 1030) - ccStraw.position = Vector2(randX, randY) - $Cupcakes.add_child(ccStraw.duplicate()) - ccCount = ccCount + ccStrawSpawnRate - -func spawnRVelCupcakes(): - 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(): +func spawnCupcakes(cupcake: Node2D, spawn_rate: int): var randX var randY randomize() if ccCount <= ccMaxOnScreen: - for i in range(ccCinSpawnRate): + for i in range(spawn_rate): 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 - -func spawnNightCupcakes(): - pass - - + cupcake.position = Vector2(randX, randY) + $Cupcakes.add_child(cupcake.duplicate()) + ccCount += spawn_rate ###Upgrades### #Vanilla @@ -298,7 +253,6 @@ func _on_upgrades_one_more_cupcake(): vanUpNum1 += 1 $Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice) collectCupcakes() - func _on_upgrades_faster_cupcake(): if ccVanNum >= ccVanPrice2: ccVanNum -= ccVanPrice2 @@ -307,7 +261,6 @@ func _on_upgrades_faster_cupcake(): vanUpNum2 += 1 $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2) collectCupcakes() - func _on_upgrades_condensed_cupcake_1(): if ccVanNum >= ccVanPrice3: ccVanNum -= ccVanPrice3 @@ -326,7 +279,6 @@ func _on_upgrades_one_more_cupcake_2(): chocUpNum1 += 1 $Upgrades/Control/ChocScroll/ChocGrid/ChocUp1/Price.text = str(ccChocPrice) collectCupcakes() - func _on_upgrades_faster_cupcake_2(): if ccChocNum >= ccChocPrice2: ccChocNum -= ccChocPrice2 @@ -335,7 +287,6 @@ func _on_upgrades_faster_cupcake_2(): chocUpNum2 += 1 $Upgrades/Control/ChocScroll/ChocGrid/ChocUp2/Price.text = str(ccChocPrice2) collectCupcakes() - func _on_upgrades_condensed_cupcake_2(): if ccChocNum >= ccChocPrice3: ccChocNum -= ccChocPrice3 @@ -354,7 +305,6 @@ func _on_upgrades_one_more_cupcake_3(): strawUpNum1 += 1 $Upgrades/Control/StrawScroll/StrawGrid/StrawUp1/Price.text = str(ccStrawPrice) collectCupcakes() - func _on_upgrades_faster_cupcake_3(): if ccStrawNum >= ccStrawPrice2: ccStrawNum -= ccStrawPrice2 @@ -362,7 +312,6 @@ func _on_upgrades_faster_cupcake_3(): timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) $Upgrades/Control/StrawScroll/StrawGrid/StrawUp2/Price.text = str(ccStrawPrice2) collectCupcakes() - func _on_upgrades_condensed_cupcake_3(): if ccStrawNum >= ccStrawPrice3: ccStrawNum -= ccStrawPrice3 @@ -379,7 +328,6 @@ func _on_upgrades_one_more_cupcake_4(): ccRVelPrice = ccRVelPrice * 1.3 $Upgrades/Control/RVelScroll/RVelGrid/RVelUp1/Price.text = str(ccRVelPrice) collectCupcakes() - func _on_upgrades_faster_cupcake_4(): if ccRVelNum >= ccRVelPrice2: ccRVelNum -= ccRVelPrice2 @@ -387,7 +335,6 @@ func _on_upgrades_faster_cupcake_4(): timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) $Upgrades/Control/RVelScroll/RVelGrid/RVelUp2/Price.text = str(ccRVelPrice2) collectCupcakes() - func _on_upgrades_condensed_cupcake_4(): if ccRVelNum >= ccRVelPrice3: ccRVelNum -= ccRVelPrice3 @@ -404,7 +351,6 @@ func _on_upgrades_one_more_cupcake_5(): ccCinPrice = ccCinPrice * 1.3 $Upgrades/Control/CinScroll/CinGrid/CinUp1/Price.text = str(ccCinPrice) collectCupcakes() - func _on_upgrades_faster_cupcake_5(): if ccCinNum >= ccCinPrice2: ccCinNum -= ccCinPrice2 @@ -412,7 +358,6 @@ func _on_upgrades_faster_cupcake_5(): timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) $Upgrades/Control/CinScroll/CinGrid/CinUp2/Price.text = str(ccCinPrice2) collectCupcakes() - func _on_upgrades_condensed_cupcake_5(): if ccCinNum >= ccCinPrice3: ccCinNum -= ccCinPrice3 @@ -551,9 +496,8 @@ func _on_night_cupcake_cc_night_collected(): #Areas func _on_upgrades_your_yard(): - if $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.disabled == false: - location = yourYard + location = areaScenes[0] $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)") @@ -561,17 +505,17 @@ func _on_upgrades_your_yard(): 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() + if neighYardLocked == true: + if ccStrawNum >= ccStrawPrice6: + ccStrawNum -= ccStrawPrice6 + neighYardLocked = false + elif neighYardLocked == false and $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.disabled == false: + location = areaScenes[1] + $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() @@ -583,9 +527,11 @@ func _on_upgrades_abandoned_castle(): #Tools func _on_upgrades_tool_1(): - tool = toolHoovesScene - + remove_child(tool) + tool = toolScenes[0] + add_child(tool) func _on_upgrades_tool_2(): - tool = toolBakingTrayScene - + remove_child(tool) + tool = toolScenes[1] + add_child(tool) diff --git a/Scripts/ingame_ui.gd b/Scripts/ingame_ui.gd index b63a456..d9af21d 100644 --- a/Scripts/ingame_ui.gd +++ b/Scripts/ingame_ui.gd @@ -12,11 +12,15 @@ extends CanvasLayer @onready var areas = $"../Upgrades/Control/AreaScroll" @onready var tools = $"../Upgrades/Control/ToolScroll" +func _ready(): + for child in allUp: + child.visible = false + func _on_van_pressed(): if vanUp.visible == false: for child in allUp: child.visible = false - vanUp.visible = true + vanUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -27,7 +31,7 @@ func _on_choc_pressed(): if chocUp.visible == false: for child in allUp: child.visible = false - chocUp.visible = true + chocUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -38,7 +42,7 @@ func _on_straw_pressed(): if strawUp.visible == false: for child in allUp: child.visible = false - strawUp.visible = true + strawUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -50,7 +54,7 @@ func _on_r_vel_pressed(): if rvelUp.visible == false: for child in allUp: child.visible = false - rvelUp.visible = true + rvelUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -62,7 +66,7 @@ func _on_cin_pressed(): if cinUp.visible == false: for child in allUp: child.visible = false - cinUp.visible = true + cinUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -74,7 +78,7 @@ func _on_honest_pressed(): if honUp.visible == false: for child in allUp: child.visible = false - honUp.visible = true + honUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -86,7 +90,7 @@ func _on_nightmare_pressed(): if nightUp.visible == false: for child in allUp: child.visible = false - nightUp.visible = true + nightUp.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -98,7 +102,7 @@ func _on_areas_pressed(): if areas.visible == false: for child in allUp: child.visible = false - areas.visible = true + areas.visible = true else: if upgrades.visible == false: upgrades.visible = true @@ -109,7 +113,7 @@ func _on_tools_pressed(): if tools.visible == false: for child in allUp: child.visible = false - tools.visible = true + tools.visible = true else: if upgrades.visible == false: upgrades.visible = true diff --git a/export_presets.cfg b/export_presets.cfg index 578d9d9..187af9b 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../CupcakeRevolution1/Linux/CupcakeRevolutionVersionZero-Linux.x86_64" +export_path="../CupcakeRevolution1/Linux/CupcakeRevolution-AlmostV0.1-Linux.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -49,7 +49,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../CupcakeRevolution1/Windows/CupcakeRevolutionVersionZero-Windows.exe" +export_path="../CupcakeRevolution1/Windows/CupcakeRevolutionVersion0.1PRERELEASE-Windows.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -109,7 +109,7 @@ Remove-Item -Recurse -Force '{temp_dir}'" name="Web" platform="Web" -runnable=true +runnable=false dedicated_server=false custom_features="" export_filter="all_resources" diff --git a/project.godot b/project.godot index 920f387..3723829 100644 --- a/project.godot +++ b/project.godot @@ -13,6 +13,9 @@ config_version=5 config/name="Cupcake Revolution" run/main_scene="res://Scenes/game_world.tscn" config/features=PackedStringArray("4.0", "Forward Plus") +boot_splash/bg_color=Color(0.976471, 0.87451, 0.945098, 1) +boot_splash/image="res://Art/Cupcakes/Cupcake.png" +config/icon="res://Art/Cupcakes/Cupcake.png" [display]