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 70bc5a1..e0aa6c7 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/Art/Tools/bakingTray.png b/Art/Tools/bakingTray.png new file mode 100644 index 0000000..af1b703 Binary files /dev/null and b/Art/Tools/bakingTray.png differ 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]