diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index a8872ff..ff58e88 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,6 +1,6 @@ -RigidBody2D -CollisionShape2D Sprite2D +CollisionShape2D +RigidBody2D Node2D Button GridContainer diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 9ff4a20..d93eff4 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 (2)" +dock_5="Inspector,Node,History,Commit (22)" [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/Locations/neighYard.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Tools/hooves.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn"] +open_scenes=["res://Scenes/game_world.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/horse.tscn", "res://Scenes/Locations/dungeonNight.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Enemies/enemyHon.tscn"] [ScriptEditor] -open_scripts=["res://Scripts/Tools/bakingTray.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcakes/cinCupcake.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/game_world.gd", "res://Scripts/Cupcakes/honCupcake.gd", "res://Scripts/Tools/hooves.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/Cupcakes/nightCupcake.gd", "res://README.md", "res://Scripts/Cupcakes/rvelCupcake.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"] +open_scripts=["res://Scripts/Tools/bakingTray.gd", "res://Scripts/Cupcakes/chocCupcake.gd", "res://Scripts/Cupcakes/cinCupcake.gd", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/enemyHon.gd", "res://Scripts/game_world.gd", "res://Scripts/Cupcakes/honCupcake.gd", "res://Scripts/Tools/hooves.gd", "res://Scripts/horse.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/Cupcakes/nightCupcake.gd", "res://README.md", "res://Scripts/Cupcakes/rvelCupcake.gd", "res://Scripts/Cupcakes/strawCupcake.gd", "res://Scripts/upgrades.gd"] open_help=["Node"] script_split_offset=70 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 663d507..1c7d733 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,19 +1,19 @@ 2a60927148abd1d33b818b535e306557 -::res://::1678564628 -export_presets.cfg::TextFile::-1::1678095426::0::1::::<><>:: +::res://::1680072698 +export_presets.cfg::TextFile::-1::1678615956::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>:: ::res://addons/::1677750379 -::res://addons/godot-git-plugin/::1677750379 +::res://addons/godot-git-plugin/::1680056617 git_plugin.gdextension::GDExtension::-1::1677750379::0::1::::<><>:: plugin.cfg::TextFile::-1::1677750379::0::1::::<><>:: 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://addons/godot-git-plugin/linux/::1680056617 +::res://addons/godot-git-plugin/macos/::1680056617 +::res://addons/godot-git-plugin/win64/::1680056617 ::res://Art/::1678613770 -::res://Art/Characters/::1677787257 +::res://Art/Characters/::1680056616 defaultMare.png::CompressedTexture2D::4875310872288488452::1677758657::1677787257::1::::<><>:: -::res://Art/Cupcakes/::1678488729 +::res://Art/Cupcakes/::1680056616 ChocCupcake.png::CompressedTexture2D::3335544482266598944::1678176377::1678176383::1::::<><>:: CinCupcake.png::CompressedTexture2D::6767289867738545589::1678488310::1678488729::1::::<><>:: Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1::::<><>:: @@ -21,48 +21,56 @@ HonCupcake.png::CompressedTexture2D::7361236424952522838::1678488638::1678488729 NightCupcake.png::CompressedTexture2D::1798860622294198324::1678488712::1678488729::1::::<><>:: RVelCupcake.png::CompressedTexture2D::4611357256445777224::1678488250::1678488729::1::::<><>:: VanCupcake.png::CompressedTexture2D::3610772439077492676::1678176993::1678176997::1::::<><>:: -::res://Art/Locations/::1677787260 +::res://Art/Locations/::1680056616 +dungeonHon.png::CompressedTexture2D::6614171134995427825::1679468176::1679469592::1::::<><>:: +dungeonNight.png::CompressedTexture2D::3363708571641826955::1679617687::1679617784::1::::<><>:: yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: -::res://Art/Tools/::1678613786 +::res://Art/Tools/::1680056617 bakingTray.png::CompressedTexture2D::5691511711123151312::1678613786::1678613792::1::::<><>:: ::res://Art/Upgrades/::1677787246 ::res://Releases/::1678095890 ::res://Releases/Linux/::1678096050 -::res://Releases/Linux/v0 Version Zero/::1678095971 -::res://Releases/Linux/v0.1 Pre-Alpha/::1678096011 +::res://Releases/Linux/v0 Version Zero/::1680056619 +::res://Releases/Linux/v0.1 Pre-Alpha/::1680056620 ::res://Releases/Web/::1678096071 -::res://Releases/Web/v0 Version Zero/::1678185607 -::res://Releases/Windows/::1678096086 -::res://Releases/Windows/v0 Version Zero/::1678096086 -::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 -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 +::res://Releases/Web/v0 Version Zero/::1680056620 +::res://Releases/Windows/::1678615524 +::res://Releases/Windows/v0 Version Zero/::1680056620 +::res://Releases/Windows/v0.1 Pre Alpha/::1680056621 +::res://Scenes/::1680056615 +game_world.tscn::PackedScene::7981802964863433317::1679621567::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<>uid://cqdqsl5kcd540 +horse.tscn::PackedScene::8568825373134700876::1679300283::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke +::res://Scenes/Cupcakes/::1680056615 +chocCupcake.tscn::PackedScene::5843790513687768897::1679300283::0::1::::<><>::res://Scripts/Cupcakes/chocCupcake.gd<>uid://bnr06vojcqkqy +cinCupcake.tscn::PackedScene::6805921059018230263::1679300282::0::1::::<><>::res://Scripts/Cupcakes/cinCupcake.gd<>uid://c3oejmmv6ysxp +cupcake.tscn::PackedScene::8468695979515826288::1679300283::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://brpc5ocwgd8ls +honCupcake.tscn::PackedScene::5338967655731389712::1679300283::0::1::::<><>::res://Scripts/Cupcakes/honCupcake.gd<>uid://dc43quvhcwa8e +nightCupcake.tscn::PackedScene::3479266486073426779::1679300282::0::1::::<><>::res://Scripts/Cupcakes/nightCupcake.gd<>uid://0vm8bhbkhqym +rvelCupcake.tscn::PackedScene::2936661773563773771::1679300282::0::1::::<><>::res://Scripts/Cupcakes/rvelCupcake.gd<>uid://b6x1m6u01x377 +strawCupcake.tscn::PackedScene::3124004694192797727::1679300283::0::1::::<><>::res://Scripts/Cupcakes/strawCupcake.gd<>uid://7fqro4fugv8k +::res://Scenes/Enemies/::1680056615 +enemyHon.tscn::PackedScene::5903060239589615715::1679620043::0::1::::<><>::res://Scripts/enemyHon.gd +::res://Scenes/Locations/::1680056615 +dungeonHon.tscn::PackedScene::5328301215832949731::1679617286::0::1::::<><>::uid://c1h7oxxgn6kd2 +dungeonNight.tscn::PackedScene::2208196008289968171::1679617835::0::1::::<><>::uid://bn6n121jt7vsd +neighYard.tscn::PackedScene::633631167704521406::1679300283::0::1::::<><>::uid://b3j662tj6h5vq yard.tscn::PackedScene::7883941411178408831::1678400136::0::1::::<><>::uid://b3j662tj6h5vq -::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 +::res://Scenes/Tools/::1680056615 +bakingTray.tscn::PackedScene::6954382797642648543::1679300283::0::1::::<><>::res://Scripts/Tools/bakingTray.gd<>uid://cndampqx57ed1 +hooves.tscn::PackedScene::7567573654608928774::1679300283::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 +::res://Scenes/UI/::1680056615 +ingame_ui.tscn::PackedScene::6815695514927101566::1679616218::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::1679300282::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k<>uid://brpc5ocwgd8ls<>uid://bnr06vojcqkqy<>uid://b6x1m6u01x377<>uid://c3oejmmv6ysxp<>uid://dc43quvhcwa8e +::res://Scripts/::1680056616 Cupcake Spawn Timer.gd::GDScript::-1::1678186507::0::1::::<>Timer<>:: -game_world.gd::GDScript::-1::1678613256::0::1::::<>Node2D<>:: +enemyHon.gd::GDScript::-1::1679620043::0::1::::<>RigidBody2D<>:: +game_world.gd::GDScript::-1::1679621567::0::1::::<>Node2D<>:: horse.gd::GDScript::-1::1678505240::0::1::::<>CharacterBody2D<>:: -ingame_ui.gd::GDScript::-1::1678611212::0::1::::<>CanvasLayer<>:: +ingame_ui.gd::GDScript::-1::1679616218::0::1::::<>CanvasLayer<>:: PlayArea.gd::GDScript::-1::1678186507::0::1::::<>Area2D<>:: upgrades.gd::GDScript::-1::1678502949::0::1::::<>CanvasLayer<>:: -::res://Scripts/Cupcakes/::1678494053 +::res://Scripts/Cupcakes/::1680056615 chocCupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: cinCupcake.gd::GDScript::-1::1678494053::0::1::::<>RigidBody2D<>:: cupcake.gd::GDScript::-1::1678180708::0::1::::<>RigidBody2D<>:: @@ -70,6 +78,6 @@ 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 +::res://Scripts/Tools/::1680056615 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 982c2ec..f59e068 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,16 +1,9 @@ -res://Scenes/game_world.tscn +res://Scenes/Enemies/enemyHon.tscn res://Scripts/game_world.gd +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/Locations/dungeonNight.tscn res://Scenes/Tools/bakingTray.tscn -res://Scenes/Tools/hooves.tscn -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 af9fbc2..2c9fe4f 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(-122.834, -146.945), +"ofs": Vector2(-131.296, -189.064), "primary_grid_steps": 8, "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.749154 +"zoom": 0.629961 } 3D={ "fov": 70.01, diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 04aaf77..3307223 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -1,6 +1,6 @@ [editor_metadata] -executable_path="/usr/bin/godot4" +executable_path="/usr/bin/godot" use_advanced_connections=true [debug_options] @@ -11,18 +11,18 @@ run_reload_scripts=true [dialog_bounds] project_settings=Rect2(814, 520, 1120, 920) -editor_settings=Rect2(830, 610, 900, 700) +editor_settings=Rect2(830, 647, 900, 700) search_help=Rect2(640, 390, 1280, 720) -export=Rect2(1083, 488, 900, 700) +export=Rect2(1083, 518, 900, 700) [color_picker] -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_presets=PackedColorArray(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, 0, 0, 0, 1, 0.913142, 0.517409, 1, 1, 0.775721, 0.607382, 1, 1) [recent_files] -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"] +scenes=["res://Scenes/Enemies/enemyHon.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/Tools/bakingTray.tscn", "res://Scenes/Locations/dungeonNight.tscn", "res://Scenes/horse.tscn", "res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/game_world.tscn", "res://Scenes/Locations/dungeonHon.tscn", "res://Scenes/Cupcakes/chocCupcake.tscn"] +scripts=["Node", "res://Scripts/enemyHon.gd", "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"] [script_setup] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 20d1d98..9b71503 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,9 +1,10 @@ +res://Scenes/Enemies +res://Scenes/Locations /home/shobie/CupcakeRevolution1/Windows /home/shobie/CupcakeRevolution1/Linux res://Art/Cupcakes res://Scripts/Tools res://Scenes/Tools -res://Scenes/Locations res://Scripts/Cupcakes res://Scenes/Cupcakes /bin diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 4f85f0d..fc12d8f 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 22, -"folded_lines": Array[int]([]), +"column": 0, +"folded_lines": Array[int]([136, 152, 159, 168, 174, 220, 228, 246, 254, 272, 280, 297, 304, 320, 327, 372, 381, 390, 399, 408, 417, 427, 432, 437, 442, 447, 452, 457, 464, 473, 496, 501]), "h_scroll_position": 0, -"row": 131, -"scroll_position": 93.0, +"row": 343, +"scroll_position": 212.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -101,11 +101,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 2, -"folded_lines": Array[int]([]), +"column": 0, +"folded_lines": Array[int]([18, 29, 40, 51, 62, 73]), "h_scroll_position": 0, -"row": 115, -"scroll_position": 50.0, +"row": 50, +"scroll_position": 12.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -221,3 +221,17 @@ state={ "selection": false, "syntax_highlighter": "GDScript" } + +[res://Scripts/enemyHon.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 0, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 11, +"scroll_position": 0.0, +"selection": false, +"syntax_highlighter": "GDScript" +} diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index e0aa6c7..2320528 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/Art/Locations/dungeonHon.png b/Art/Locations/dungeonHon.png new file mode 100644 index 0000000..2435fd1 Binary files /dev/null and b/Art/Locations/dungeonHon.png differ diff --git a/Art/Locations/dungeonHon.png.import b/Art/Locations/dungeonHon.png.import new file mode 100644 index 0000000..4ebf6a7 --- /dev/null +++ b/Art/Locations/dungeonHon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1h7oxxgn6kd2" +path="res://.godot/imported/dungeonHon.png-b9f1d47544211a85bc4fc86940c9f7e2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Locations/dungeonHon.png" +dest_files=["res://.godot/imported/dungeonHon.png-b9f1d47544211a85bc4fc86940c9f7e2.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/Locations/dungeonNight.png b/Art/Locations/dungeonNight.png new file mode 100644 index 0000000..52d2727 Binary files /dev/null and b/Art/Locations/dungeonNight.png differ diff --git a/Art/Locations/dungeonNight.png.import b/Art/Locations/dungeonNight.png.import new file mode 100644 index 0000000..94360ac --- /dev/null +++ b/Art/Locations/dungeonNight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bn6n121jt7vsd" +path="res://.godot/imported/dungeonNight.png-ae021c1b5b09eee6d512942d4a4dc37e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Art/Locations/dungeonNight.png" +dest_files=["res://.godot/imported/dungeonNight.png-ae021c1b5b09eee6d512942d4a4dc37e.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/Enemies/enemyHon.tscn b/Scenes/Enemies/enemyHon.tscn new file mode 100644 index 0000000..6d9aa53 --- /dev/null +++ b/Scenes/Enemies/enemyHon.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=3 format=3 uid="uid://cqdqsl5kcd540"] + +[ext_resource type="Script" path="res://Scripts/enemyHon.gd" id="1_u0f3a"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_1qaxj"] +radius = 79.0 +height = 208.0 + +[node name="EnemyHon" type="RigidBody2D"] +script = ExtResource("1_u0f3a") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CapsuleShape2D_1qaxj") + +[node name="Sprite2D" type="Sprite2D" parent="."] + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/Scenes/Locations/dungeonHon.tscn b/Scenes/Locations/dungeonHon.tscn new file mode 100644 index 0000000..4140760 --- /dev/null +++ b/Scenes/Locations/dungeonHon.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://ch6clv8ugoe3l"] + +[ext_resource type="Texture2D" uid="uid://c1h7oxxgn6kd2" path="res://Art/Locations/dungeonHon.png" id="1_fgawn"] + +[node name="Sprite2D" type="Sprite2D"] +position = Vector2(-33.9999, -26) +scale = Vector2(0.516406, 0.531481) +texture = ExtResource("1_fgawn") +centered = false +flip_h = true diff --git a/Scenes/Locations/dungeonNight.tscn b/Scenes/Locations/dungeonNight.tscn new file mode 100644 index 0000000..c9c5905 --- /dev/null +++ b/Scenes/Locations/dungeonNight.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=2 format=3 uid="uid://6pwwvqedihxr"] + +[ext_resource type="Texture2D" uid="uid://bn6n121jt7vsd" path="res://Art/Locations/dungeonNight.png" id="1_13yoi"] + +[node name="Sprite2D" type="Sprite2D"] +position = Vector2(-33.9999, -26) +scale = Vector2(0.772656, 0.797917) +texture = ExtResource("1_13yoi") +centered = false diff --git a/Scenes/UI/ingame_ui.tscn b/Scenes/UI/ingame_ui.tscn index d2b7afb..d24e980 100644 --- a/Scenes/UI/ingame_ui.tscn +++ b/Scenes/UI/ingame_ui.tscn @@ -19,6 +19,7 @@ offset_left = 16.0 offset_top = 997.0 offset_right = 1908.0 offset_bottom = 1066.0 +focus_mode = 2 [node name="HBoxContainer" type="HBoxContainer" parent="Main"] layout_mode = 2 diff --git a/Scenes/UI/upgrades.tscn b/Scenes/UI/upgrades.tscn index 906d517..eb70664 100644 --- a/Scenes/UI/upgrades.tscn +++ b/Scenes/UI/upgrades.tscn @@ -258,7 +258,7 @@ texture = ExtResource("2_c66ch") [node name="Price" type="Label" parent="Control/AreaScroll/AreaGrid/Area2"] layout_mode = 2 -text = "15000" +text = "50000" [node name="Desc2" type="Label" parent="Control/AreaScroll/AreaGrid"] layout_mode = 2 diff --git a/Scenes/game_world.tscn b/Scenes/game_world.tscn index 85f394a..81b478d 100644 --- a/Scenes/game_world.tscn +++ b/Scenes/game_world.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://dlypem0porccr"] +[gd_scene load_steps=15 format=3 uid="uid://dlypem0porccr"] [ext_resource type="Script" path="res://Scripts/game_world.gd" id="1_c2sx0"] [ext_resource type="Script" path="res://Scripts/Cupcake Spawn Timer.gd" id="2_bjylp"] @@ -12,6 +12,7 @@ [ext_resource type="PackedScene" uid="uid://c373r4pv46ydj" path="res://Scenes/Cupcakes/cinCupcake.tscn" id="9_4x6i5"] [ext_resource type="PackedScene" uid="uid://ciciat7jdjboy" path="res://Scenes/Cupcakes/honCupcake.tscn" id="10_ui0cc"] [ext_resource type="PackedScene" uid="uid://bptnammqx5dk2" path="res://Scenes/Cupcakes/nightCupcake.tscn" id="11_n5j3q"] +[ext_resource type="PackedScene" uid="uid://cqdqsl5kcd540" path="res://Scenes/Enemies/enemyHon.tscn" id="13_mdk60"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_g5fj2"] size = Vector2(1820, 986) @@ -34,31 +35,31 @@ script = ExtResource("2_bjylp") [node name="Cupcakes" type="Node2D" parent="."] [node name="VanCupcake" parent="Cupcakes" instance=ExtResource("2_fi3r2")] -position = Vector2(746, -1450) +position = Vector2(46, -1490) freeze = true [node name="ChocCupcake" parent="Cupcakes" instance=ExtResource("6_8pgeb")] -position = Vector2(811, -1449) +position = Vector2(111, -1489) freeze = true [node name="StrawCupcake" parent="Cupcakes" instance=ExtResource("7_mcfjy")] -position = Vector2(877, -1445) +position = Vector2(177, -1485) freeze = true [node name="RVelCupcake" parent="Cupcakes" instance=ExtResource("8_y2btb")] -position = Vector2(938, -1446) +position = Vector2(238, -1486) freeze = true [node name="CinCupcake" parent="Cupcakes" instance=ExtResource("9_4x6i5")] -position = Vector2(1000, -1450) +position = Vector2(300, -1490) freeze = true [node name="HonCupcake" parent="Cupcakes" instance=ExtResource("10_ui0cc")] -position = Vector2(1058, -1446) +position = Vector2(358, -1486) freeze = true [node name="NightCupcake" parent="Cupcakes" instance=ExtResource("11_n5j3q")] -position = Vector2(1118, -1448) +position = Vector2(418, -1488) freeze = true [node name="PlayArea" type="Area2D" parent="."] @@ -72,6 +73,9 @@ script = ExtResource("3_3x1i6") position = Vector2(957, 539) shape = SubResource("RectangleShape2D_g5fj2") +[node name="EnemyHon" parent="." instance=ExtResource("13_mdk60")] +position = Vector2(112, -1691) + [connection signal="abandonedCastle" from="Upgrades" to="." method="_on_upgrades_abandoned_castle"] [connection signal="condensedCupcake1" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_1"] [connection signal="condensedCupcake2" from="Upgrades" to="." method="_on_upgrades_condensed_cupcake_2"] diff --git a/Scripts/enemyHon.gd b/Scripts/enemyHon.gd new file mode 100644 index 0000000..20996f8 --- /dev/null +++ b/Scripts/enemyHon.gd @@ -0,0 +1,11 @@ +extends RigidBody2D + +signal attack +signal hit +@onready var Cupcakes = $"../Cupcakes" + +func _on_body_entered(body): + if body.is_in_group("Horse"): + emit_signal("attack") + elif body.is_inside_tree(Cupcakes): + emit_signal("hit") diff --git a/Scripts/game_world.gd b/Scripts/game_world.gd index b568f23..291bf3c 100644 --- a/Scripts/game_world.gd +++ b/Scripts/game_world.gd @@ -1,67 +1,36 @@ extends Node2D #Cupcake Values -var ccVanNum: int = 0 -var ccVanValue: int = 1 -var ccChocNum: int = 0 -var ccChocValue: int = 1 -var ccStrawNum: int = 0 -var ccStrawValue: int = 1 -var ccRVelNum: int = 0 -var ccRVelValue: int = 1 -var ccCinNum: int = 0 -var ccCinValue: int = 1 -var ccHonNum: int = 0 -var ccHonValue: int = 1 -var ccNightmareNum: int = 0 -var ccNightmareValue: int = 1 +var ccValues = { +"van": [0, 1], +"choc": [0, 1], +"straw": [0, 1], +"rvel": [0, 1], +"cin": [0, 1], +"hon": [0, 1], +"night": [0, 1] +} #Cupcake Upgrade Prices -var ccVanPrice: int = 10 -var ccVanPrice2: int = 15 -var ccVanPrice3: int = 15 -var ccVanPrice4: int = 25000 -var ccChocPrice: int = 10 -var ccChocPrice2: int = 15 -var ccChocPrice3: int = 15 -var ccChocPrice4: int = 50000 -var ccChocPrice5: int = 150 -var ccChocPrice6: int -var ccStrawPrice: int = 10 -var ccStrawPrice2: int = 15 -var ccStrawPrice3: int = 15 -var ccStrawPrice4: int = 75000 -var ccStrawPrice5: int = 150 -var ccStrawPrice6: int = 200 -var ccRVelPrice: int = 10 -var ccRVelPrice2: int = 15 -var ccRVelPrice3: int = 15 -var ccRVelPrice4: int = 100000 -var ccCinPrice: int = 10 -var ccCinPrice2: int = 15 -var ccCinPrice3: int = 15 -var ccCinPrice4: int = 125000 -var ccHonPrice: int = 10 -var ccHonPrice2: int = 15 -var ccHonPrice3: int = 15 -var ccHonPrice4: int = 150000 -var ccNightPrice: int = 10 -var ccNightPrice2: int = 15 -var ccNightPrice3: int = 15 -var ccNightPrice4: int = 175000 - -#Upgrade counts -var vanUpNum1: int = 0 -var vanUpNum2: int = 0 -var vanUpNum3: int = 0 -var vanUpNum4: int = 0 -var chocUpNum1: int = 0 -var chocUpNum2: int = 0 -var chocUpNum3: int = 0 -var chocUpNum4: int = 0 -var chocUpNum5: int = 0 -var chocUpNum6: int = 0 -var strawUpNum1: int = 0 +var ccPrices = { +"van": [10, 15, 15, 25000], +"choc": [10, 15, 15, 50000, 150, null], +"straw": [10, 15, 15, 75000, 2000, 50, 150, 200, 50000], +"rvel": [10, 15, 15, 100000], +"cin": [10, 15, 15, 125000], +"hon": [10, 15, 15, 150000], +"night": [10, 15, 15, 175000] +} + +var UpNum = { + "van": [0, 0, 0, 0], + "choc": [0, 0, 0, 0, 0, 0], + "straw": [0, 0, 0, 0, 0, 0, 0], + "rvel": [0, 0, 0, 0], + "cin": [0, 0, 0, 0], + "hon": [0, 0, 0, 0], + "night": [0, 0, 0, 0] +} ###Preloaded scenes and scripts var upgradeUI = preload("res://Scenes/UI/upgrades.tscn") @@ -87,7 +56,9 @@ var ccChaos var location = null const AREA_PATHS = [ "res://Scenes/Locations/yard.tscn", - "res://Scenes/Locations/neighYard.tscn" + "res://Scenes/Locations/neighYard.tscn", + "res://Scenes/Locations/dungeonHon.tscn", + "res://Scenes/Locations/dungeonNight.tscn" ] var areaScenes = [] @@ -125,6 +96,7 @@ var ccDiaLocked = true var ccChaLocked = true #Spawnrates +var ccSpawnRates = [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3] var ccVanSpawnRate = 3 var ccChocSpawnRate = 3 var ccStrawSpawnRate = 3 @@ -178,7 +150,6 @@ func _ready(): tool = toolScenes[0] add_child(tool) - func _process(delta): if horseAttached == true: mouse_position = get_global_mouse_position() @@ -186,8 +157,6 @@ func _process(delta): if $"Tool": tool.position = mouse_position - - func _input(event): if event is InputEventMouseButton and event.pressed: if Input.is_action_pressed("horseAttach"): @@ -202,31 +171,27 @@ func spawnHorse(): $Location.remove_child(location) $Location.add_child(location) -#Tool Refresh -func toolRefresh(): - pass - #Update Count func collectCupcakes(): - $InGameUI/Num/NumGrid/ccVanNum.text = str(ccVanNum) - $InGameUI/Num/NumGrid/ccChocNum.text = str(ccChocNum) - $InGameUI/Num/NumGrid/ccStrawNum.text = str(ccStrawNum) - $InGameUI/Num/NumGrid/ccRVelNum.text = str(ccRVelNum) - $InGameUI/Num/NumGrid/ccCinNum.text = str(ccCinNum) - $InGameUI/Num/NumGrid/ccHonNum.text = str(ccHonNum) - $InGameUI/Num/NumGrid/ccNightNum.text = str(ccNightmareNum) + $InGameUI/Num/NumGrid/ccVanNum.text = str(ccValues["van"][0]) + $InGameUI/Num/NumGrid/ccChocNum.text = str(ccValues["choc"][0]) + $InGameUI/Num/NumGrid/ccStrawNum.text = str(ccValues["straw"][0]) + $InGameUI/Num/NumGrid/ccRVelNum.text = str(ccValues["rvel"][0]) + $InGameUI/Num/NumGrid/ccCinNum.text = str(ccValues["cin"][0]) + $InGameUI/Num/NumGrid/ccHonNum.text = str(ccValues["hon"][0]) + $InGameUI/Num/NumGrid/ccNightNum.text = str(ccValues["night"][0]) #Cupcake Timer func _on_timeout(): - spawnCupcakes(ccVan, ccVanSpawnRate) + spawnCupcakes(ccVan, ccSpawnRates[0]) if not ccChocLocked: - spawnCupcakes(ccChoc, ccChocSpawnRate) + spawnCupcakes(ccChoc, ccSpawnRates[1]) if not ccStrawLocked: - spawnCupcakes(ccStraw, ccStrawSpawnRate) + spawnCupcakes(ccStraw, ccSpawnRates[2]) if not ccRVelLocked: - spawnCupcakes(ccRVel, ccRVelSpawnRate) + spawnCupcakes(ccRVel, ccSpawnRates[3]) if not ccCinLocked: - spawnCupcakes(ccCin, ccCinSpawnRate) + spawnCupcakes(ccCin, ccSpawnRates[4]) collectCupcakes() timer.start() @@ -246,149 +211,151 @@ func spawnCupcakes(cupcake: Node2D, spawn_rate: int): ###Upgrades### #Vanilla func _on_upgrades_one_more_cupcake(): - if ccVanNum >= ccVanPrice: - ccVanSpawnRate += 1 - ccVanNum -= ccVanPrice - ccVanPrice = ccVanPrice * 1.3 - vanUpNum1 += 1 - $Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccVanPrice) + if ccValues["van"][0] >= ccPrices["van"][0]: + ccSpawnRates[0] += 1 + ccValues["van"][0] -= ccPrices["van"][0] + ccPrices = ccPrices["van"][0] * 1.3 + UpNum["van"][0] += 1 + $Upgrades/Control/VanScroll/VanGrid/VanUp1/Price.text = str(ccPrices["van"][0]) collectCupcakes() func _on_upgrades_faster_cupcake(): - if ccVanNum >= ccVanPrice2: - ccVanNum -= ccVanPrice2 - ccVanPrice2 = ccVanPrice2 * 1.3 + if ccValues["van"][0] >= ccPrices["van"][1]: + ccValues["van"][0] -= ccPrices["van"][1] + ccPrices["van"][1] = ccPrices["van"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - vanUpNum2 += 1 - $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccVanPrice2) + UpNum["van"][1] += 1 + $Upgrades/Control/VanScroll/VanGrid/VanUp2/Price.text = str(ccPrices["van"][1]) collectCupcakes() func _on_upgrades_condensed_cupcake_1(): - if ccVanNum >= ccVanPrice3: - ccVanNum -= ccVanPrice3 - ccVanPrice3 = ccVanPrice3 * 1.3 - ccVanValue += 1 - vanUpNum3 += 1 - $Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccVanPrice3) + if ccValues["van"][0] >= ccPrices["van"][2]: + ccValues["van"][0] -= ccPrices["van"][2] + ccPrices["van"][2] = ccPrices["van"][2] * 1.3 + ccValues["van"][1] += 1 + UpNum["van"][2] += 1 + $Upgrades/Control/VanScroll/VanGrid/VanUp3/Price.text = str(ccPrices["van"][2]) collectCupcakes() #Chocolate func _on_upgrades_one_more_cupcake_2(): - if ccChocNum >= ccChocPrice: - ccChocSpawnRate += 1 - ccChocNum -= ccChocPrice - ccChocPrice = ccChocPrice * 1.3 - chocUpNum1 += 1 - $Upgrades/Control/ChocScroll/ChocGrid/ChocUp1/Price.text = str(ccChocPrice) + if ccValues["choc"][0] >= ccPrices["choc"][0]: + ccSpawnRates[1] += 1 + ccValues["choc"][0] -= ccPrices["choc"][0] + ccPrices["choc"][0] = ccPrices["choc"][0] * 1.3 + UpNum["choc"][0] += 1 + $Upgrades/Control/ChocScroll/ChocGrid/ChocUp1/Price.text = str(ccPrices["choc"][0]) collectCupcakes() func _on_upgrades_faster_cupcake_2(): - if ccChocNum >= ccChocPrice2: - ccChocNum -= ccChocPrice2 - ccChocPrice2 = ccChocPrice2 * 1.3 + if ccValues["choc"][0] >= ccPrices["choc"][1]: + ccValues["choc"][0] -= ccPrices["choc"][1] + ccPrices["choc"][1] = ccPrices["choc"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - chocUpNum2 += 1 - $Upgrades/Control/ChocScroll/ChocGrid/ChocUp2/Price.text = str(ccChocPrice2) + UpNum["choc"][1] += 1 + $Upgrades/Control/ChocScroll/ChocGrid/ChocUp2/Price.text = str(ccPrices["choc"][1]) collectCupcakes() func _on_upgrades_condensed_cupcake_2(): - if ccChocNum >= ccChocPrice3: - ccChocNum -= ccChocPrice3 - ccChocPrice3 = ccChocPrice3 * 1.3 - ccChocValue += 1 - chocUpNum3 += 1 - $Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccChocPrice3) + if ccValues["choc"][0] >= ccPrices["choc"][2]: + ccValues["choc"][0] -= ccPrices["choc"][2] + ccPrices["choc"][2] = ccPrices["choc"][2] * 1.3 + ccValues["choc"][1] += 1 + UpNum["choc"][2] += 1 + $Upgrades/Control/ChocScroll/ChocGrid/ChocUp3/Price.text = str(ccPrices["choc"][2]) collectCupcakes() #Strawberry func _on_upgrades_one_more_cupcake_3(): - if ccStrawNum >= ccStrawPrice: - ccStrawSpawnRate += 1 - ccStrawNum -= ccStrawPrice - ccStrawPrice = ccStrawPrice * 1.3 - strawUpNum1 += 1 - $Upgrades/Control/StrawScroll/StrawGrid/StrawUp1/Price.text = str(ccStrawPrice) + if ccValues["straw"][0] >= ccPrices["straw"][0]: + ccSpawnRates[2] += 1 + ccValues["straw"][0] -= ccPrices["straw"][0] + ccPrices = ccPrices * 1.3 + UpNum["straw"][0] += 1 + $Upgrades/Control/StrawScroll/StrawGrid/StrawUp1/Price.text = str(ccPrices) collectCupcakes() func _on_upgrades_faster_cupcake_3(): - if ccStrawNum >= ccStrawPrice2: - ccStrawNum -= ccStrawPrice2 - ccStrawPrice2 = ccStrawPrice2 * 1.3 + if ccValues["straw"][0] >= ccPrices["straw"][1]: + ccValues["straw"][0] -= ccPrices["straw"][1] + ccPrices["straw"][1] = ccPrices["straw"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/StrawScroll/StrawGrid/StrawUp2/Price.text = str(ccStrawPrice2) + UpNum["straw"][1] += 1 + $Upgrades/Control/StrawScroll/StrawGrid/StrawUp2/Price.text = str(ccPrices["straw"][1]) collectCupcakes() func _on_upgrades_condensed_cupcake_3(): - if ccStrawNum >= ccStrawPrice3: - ccStrawNum -= ccStrawPrice3 - ccStrawPrice3 = ccStrawPrice3 * 1.3 - ccStrawValue += 1 - $Upgrades/Control/StrawScroll/StrawGrid/StrawUp3/Price.text = str(ccStrawPrice3) + if ccValues["straw"][0] >= ccPrices["straw"][2]: + ccValues["straw"][0] -= ccPrices["straw"][2] + ccPrices["straw"][2] = ccPrices["straw"][2] * 1.3 + ccValues["straw"][1] += 1 + UpNum["straw"][2] += 1 + $Upgrades/Control/StrawScroll/StrawGrid/StrawUp3/Price.text = str(ccPrices["straw"][2]) collectCupcakes() #Red Velvet func _on_upgrades_one_more_cupcake_4(): - if ccRVelNum >= ccRVelPrice: - ccRVelSpawnRate += 1 - ccRVelNum -= ccRVelPrice - ccRVelPrice = ccRVelPrice * 1.3 - $Upgrades/Control/RVelScroll/RVelGrid/RVelUp1/Price.text = str(ccRVelPrice) + if ccValues["rvel"][0] >= ccPrices["rvel"][0]: + ccSpawnRates[3] += 1 + ccValues["rvel"][0] -= ccPrices["rvel"][0] + ccPrices["rvel"][0] = ccPrices["rvel"][0] * 1.3 + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp1/Price.text = str(ccPrices["rvel"][0]) collectCupcakes() func _on_upgrades_faster_cupcake_4(): - if ccRVelNum >= ccRVelPrice2: - ccRVelNum -= ccRVelPrice2 - ccRVelPrice2 = ccRVelPrice2 * 1.3 + if ccValues["rvel"][0] >= ccPrices["rvel"][1]: + ccValues["rvel"][0] -= ccPrices["rvel"][1] + ccPrices["rvel"][1] = ccPrices["rvel"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/RVelScroll/RVelGrid/RVelUp2/Price.text = str(ccRVelPrice2) + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp2/Price.text = str(ccPrices["rvel"][1]) collectCupcakes() func _on_upgrades_condensed_cupcake_4(): - if ccRVelNum >= ccRVelPrice3: - ccRVelNum -= ccRVelPrice3 - ccRVelPrice3 = ccRVelPrice3 * 1.3 - ccRVelValue += 1 - $Upgrades/Control/RVelScroll/RVelGrid/RVelUp3/Price.text = str(ccRVelPrice3) + if ccValues["rvel"][0] >= ccPrices["rvel"][2]: + ccValues["rvel"][0] -= ccPrices["rvel"][2] + ccPrices["rvel"][2] = ccPrices["rvel"][2] * 1.3 + ccValues["rvel"][1] += 1 + $Upgrades/Control/RVelScroll/RVelGrid/RVelUp3/Price.text = str(ccPrices["rvel"][2]) collectCupcakes() #Cinnamon func _on_upgrades_one_more_cupcake_5(): - if ccCinNum >= ccCinPrice: - ccCinSpawnRate += 1 - ccCinNum -= ccCinPrice - ccCinPrice = ccCinPrice * 1.3 - $Upgrades/Control/CinScroll/CinGrid/CinUp1/Price.text = str(ccCinPrice) + if ccValues["cin"][0] >= ccPrices["cin"][0]: + ccSpawnRates[4] += 1 + ccValues["cin"][0] -= ccPrices["cin"][0] + ccPrices["cin"][0] = ccPrices["cin"][0] * 1.3 + $Upgrades/Control/CinScroll/CinGrid/CinUp1/Price.text = str(ccPrices["cin"][0]) collectCupcakes() func _on_upgrades_faster_cupcake_5(): - if ccCinNum >= ccCinPrice2: - ccCinNum -= ccCinPrice2 - ccCinPrice2 = ccCinPrice2 * 1.3 + if ccValues["cin"][0] >= ccPrices["cin"][1]: + ccValues["cin"][0] -= ccPrices["cin"][1] + ccPrices["cin"][1] = ccPrices["cin"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/CinScroll/CinGrid/CinUp2/Price.text = str(ccCinPrice2) + $Upgrades/Control/CinScroll/CinGrid/CinUp2/Price.text = str(ccPrices["cin"][1]) collectCupcakes() func _on_upgrades_condensed_cupcake_5(): - if ccCinNum >= ccCinPrice3: - ccCinNum -= ccCinPrice3 - ccCinPrice3 = ccCinPrice3 * 1.3 - ccCinValue += 1 - $Upgrades/Control/CinScroll/CinGrid/CinUp3/Price.text = str(ccCinPrice3) + if ccValues["cin"][0] >= ccPrices["cin"][2]: + ccValues["cin"][0] -= ccPrices["cin"][2] + ccPrices["cin"][2] = ccPrices["cin"][2] * 1.3 + ccValues["cin"][1] += 1 + $Upgrades/Control/CinScroll/CinGrid/CinUp3/Price.text = str(ccPrices["cin"][2]) collectCupcakes() #Honest -func _on_upgrades_condensed_cupcake_6(): - if ccHonNum >= ccHonPrice: +func _on_upgrades_one_more_cupcake_6(): + if ccValues["hon"][0] >= ccPrices["hon"][0]: ccHonSpawnRate += 1 - ccHonNum -= ccHonPrice - ccHonPrice = ccHonPrice * 1.3 - $Upgrades/Control/HonScroll/HonGrid/HonUp1/Price.text = str(ccHonPrice) + ccValues["hon"][0] -= ccPrices["hon"][0] + ccPrices["hon"][0] = ccPrices["hon"][0] * 1.3 + $Upgrades/Control/HonScroll/HonGrid/HonUp1/Price.text = str(ccPrices["hon"][0]) collectCupcakes() func _on_upgrades_faster_cupcake_6(): - if ccHonNum >= ccHonPrice2: - ccHonNum -= ccHonPrice2 - ccHonPrice2 = ccHonPrice2 * 1.3 + if ccValues["hon"][0] >= ccPrices["hon"][1]: + ccValues["hon"][0] -= ccPrices["hon"][1] + ccPrices["hon"][1] = ccPrices["hon"][1] * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) - $Upgrades/Control/HonScroll/HonGrid/HonUp2/Price.text = str(ccHonPrice2) + $Upgrades/Control/HonScroll/HonGrid/HonUp2/Price.text = str(ccPrices["hon"][1]) collectCupcakes() -func _on_upgrades_one_more_cupcake_6(): - if ccHonNum >= ccHonPrice3: - ccHonNum -= ccHonPrice3 - ccHonPrice3 = ccHonPrice3 * 1.3 - ccHonValue += 1 - $Upgrades/Control/HonScroll/HonGrid/HonUp3/Price.text = str(ccHonPrice3) +func _on_upgrades_condensed_cupcake_6(): + if ccValues["hon"][0] >= ccPrices["hon"][2]: + ccValues["hon"][0] -= ccPrices["hon"][2] + ccPrices["hon"][2] = ccPrices["hon"][2] * 1.3 + ccValues["hon"][1] += 1 + $Upgrades/Control/HonScroll/HonGrid/HonUp3/Price.text = str(ccPrices["hon"][2]) collectCupcakes() func _on_upgrades_cupcake_damage(): @@ -404,53 +371,53 @@ func _on_upgrades_sweetie_damage(): #Unlock func _on_upgrades_unlock_choc(): - if ccVanNum >= ccVanPrice4: - ccVanNum -= ccVanPrice4 + if ccValues["van"][0] >= ccPrices["van"][3]: + ccValues -= ccPrices["van"][3] ccChocLocked = false $"InGameUI/Main/HBoxContainer/Choc".visible = true $"InGameUI/Num/NumGrid/chocIcon".visible = true - $"InGameUI/Num/NumGrid/ccChocNum".visible = true + $"InGameUI/Num/NumGrid/ccValues".visible = true $"Upgrades/Control/VanScroll/VanGrid/VanUp4/Buy".visible = false func _on_upgrades_unlock_straw(): - if ccChocNum >= ccChocPrice4: - ccChocNum -= ccChocPrice4 + if ccValues["choc"][0] >= ccPrices["choc"][3]: + ccValues["choc"][0] -= ccPrices["choc"][3] ccStrawLocked = false $"InGameUI/Main/HBoxContainer/Straw".visible = true $"InGameUI/Num/NumGrid/strawIcon".visible = true - $"InGameUI/Num/NumGrid/ccStrawNum".visible = true + $"InGameUI/Num/NumGrid/ccValues".visible = true $"Upgrades/Control/ChocScroll/ChocGrid/ChocUp4/Buy".visible = false func _on_upgrades_unlock_r_vel(): - if ccStrawNum >= ccStrawPrice4: - ccStrawNum -= ccStrawPrice4 + if ccValues >= ccPrices["straw"][8]: + ccValues["straw"][0] -= ccPrices["straw"][8] ccRVelLocked = false $"InGameUI/Main/HBoxContainer/RVel".visible = true $"InGameUI/Num/NumGrid/rvelIcon".visible = true - $"InGameUI/Num/NumGrid/ccRVelNum".visible = true + $"InGameUI/Num/NumGrid/ccValues".visible = true $"Upgrades/Control/StrawScroll/StrawGrid/StrawUp4/Buy".visible = false func _on_upgrades_unlock_cin(): - if ccRVelNum >= ccRVelPrice4: - ccRVelNum -= ccRVelPrice4 + if ccValues["rvel"][0] >= ccPrices["rvel"][3]: + ccValues["rvel"][0] -= ccPrices["rvel"][3] ccCinLocked = false $"InGameUI/Main/HBoxContainer/Cin".visible = true $"InGameUI/Num/NumGrid/cinIcon".visible = true - $"InGameUI/Num/NumGrid/ccCinNum".visible = true + $"InGameUI/Num/NumGrid/ccValues".visible = true $"Upgrades/Control/RVelScroll/RVelGrid/RVelUp4/Buy".visible = false func _on_upgrades_unlock_hon(): - if ccCinNum >= ccCinPrice4: - ccCinNum -= ccCinPrice4 + if ccValues >= ccPrices["cin"][3]: + ccValues["cin"][0] -= ccPrices["cin"][3] ccHonLocked = false $"InGameUI/Main/HBoxContainer/Honest".visible = true $"InGameUI/Num/NumGrid/honIcon".visible = true - $"InGameUI/Num/NumGrid/ccHonNum".visible = true + $"InGameUI/Num/NumGrid/ccValues".visible = true $"Upgrades/Control/CinScroll/CinGrid/CinUp4/Buy".visible = false func _on_upgrades_unlock_nightmare(): - if ccHonNum >= ccHonPrice4: - ccHonNum -= ccHonPrice4 + if ccValues["hon"][0] >= ccPrices["hon"][3]: + ccValues -= ccPrices["hon"][3] ccNightLocked = false $"InGameUI/Main/HBoxContainer/Night".visible = true $"InGameUI/Num/NumGrid/nightIcon".visible = true @@ -459,37 +426,37 @@ func _on_upgrades_unlock_nightmare(): #Collect func _on_van_cupcake_cc_van_collected(): - ccVanNum += ccVanValue + ccValues["van"][0] += ccValues["van"][1] ccCount -= 1 collectCupcakes() func _on_choc_cupcake_cc_choc_collected(): - ccChocNum += ccChocValue + ccValues["choc"][0] += ccValues["choc"][1] ccCount -= 1 collectCupcakes() func _on_straw_cupcake_cc_straw_collected(): - ccStrawNum += ccStrawValue + ccValues["straw"][0] += ccValues["straw"][1] ccCount -= 1 collectCupcakes() - + func _on_rvel_cupcake_cc_rvel_collected(): - ccRVelNum += ccRVelValue + ccValues["rvel"][0] += ccValues["rvel"][1] ccCount -= 1 collectCupcakes() func _on_cin_cupcake_cc_cin_collected(): - ccCinNum += ccCinValue + ccValues["cin"][0] += ccValues["cin"][1] ccCount -= 1 collectCupcakes() func _on_honest_cupcake_cc_hon_collected(): - ccHonNum += ccHonValue + ccValues["hon"][0] += ccValues["hon"][1] ccCount -= 1 collectCupcakes() func _on_night_cupcake_cc_night_collected(): - ccNightmareNum += ccNightmareValue + ccValues["night"][0] += ccValues["night"][1] ccCount -= 1 collectCupcakes() @@ -506,10 +473,11 @@ func _on_upgrades_your_yard(): func _on_upgrades_neigh_yard(): if neighYardLocked == true: - if ccStrawNum >= ccStrawPrice6: - ccStrawNum -= ccStrawPrice6 + if ccValues["straw"][0] >= ccPrices["straw"][6]: + ccValues["straw"][0] -= ccPrices["straw"][6] neighYardLocked = false - elif neighYardLocked == false and $Upgrades/Control/AreaScroll/AreaGrid/Area2/Buy.disabled == false: + $Upgrades/Control/AreaScroll/AreaGrid/Area1/Buy.text = str("Teleport") + if 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 diff --git a/Scripts/ingame_ui.gd b/Scripts/ingame_ui.gd index d9af21d..4d32a43 100644 --- a/Scripts/ingame_ui.gd +++ b/Scripts/ingame_ui.gd @@ -49,7 +49,6 @@ func _on_straw_pressed(): else: upgrades.visible = false - func _on_r_vel_pressed(): if rvelUp.visible == false: for child in allUp: @@ -61,7 +60,6 @@ func _on_r_vel_pressed(): else: upgrades.visible = false - func _on_cin_pressed(): if cinUp.visible == false: for child in allUp: @@ -73,7 +71,6 @@ func _on_cin_pressed(): else: upgrades.visible = false - func _on_honest_pressed(): if honUp.visible == false: for child in allUp: @@ -85,7 +82,6 @@ func _on_honest_pressed(): else: upgrades.visible = false - func _on_nightmare_pressed(): if nightUp.visible == false: for child in allUp: @@ -97,7 +93,6 @@ func _on_nightmare_pressed(): else: upgrades.visible = false - func _on_areas_pressed(): if areas.visible == false: for child in allUp: