From ef5a3a08b7c7d49377abf0eed4b6865a67070777 Mon Sep 17 00:00:00 2001 From: OnlyMares Date: Mon, 6 Mar 2023 02:38:50 -0600 Subject: [PATCH] Nightly push 2 -updated Godot to Stable -added export templates -Version Zero released Version Zero is the basics of the game that make it playable. Player, item, score, shop, upgrades. --- .godot/editor/create_recent.Node | 3 +- ...lding-c7065fd652f87712eb190c1157c23200.cfg | 2 +- .godot/editor/editor_layout.cfg | 2 +- .godot/editor/filesystem_cache8 | 40 +++++++++--------- .godot/editor/filesystem_update4 | 10 +---- .godot/editor/project_metadata.cfg | 14 +++--- .godot/editor/recent_dirs | 2 +- .godot/editor/script_editor_cache.cfg | 12 ++++-- .godot/uid_cache.bin | Bin 550 -> 383 bytes Scenes/Cupcakes/cupcake.tscn | 1 + Scenes/UI/ingame_ui.tscn | 22 +++++----- Scenes/UI/upgrades.tscn | 2 + Scenes/game_world.tscn | 4 +- Scripts/game_world.gd | 6 +-- export_presets.cfg | 5 +-- 15 files changed, 66 insertions(+), 59 deletions(-) diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 2d5bdec..529675e 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,6 +1,7 @@ +Control +Container HBoxContainer TextureRect -Control Sprite2D Label Button diff --git a/.godot/editor/cupcake.tscn-folding-c7065fd652f87712eb190c1157c23200.cfg b/.godot/editor/cupcake.tscn-folding-c7065fd652f87712eb190c1157c23200.cfg index ca9275a..a164987 100644 --- a/.godot/editor/cupcake.tscn-folding-c7065fd652f87712eb190c1157c23200.cfg +++ b/.godot/editor/cupcake.tscn-folding-c7065fd652f87712eb190c1157c23200.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Collision", "Linear", "Angular", "Constant Forces"), NodePath("Sprite2D"), PackedStringArray("texture", "Texture", "Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Collision", "Linear", "Angular", "Constant Forces", "Transform"), NodePath("Sprite2D"), PackedStringArray("texture", "Texture", "Transform")] resource_unfolds=["res://Scenes/Cupcakes/cupcake.tscn::CircleShape2D_svirt", PackedStringArray()] nodes_folded=[NodePath("Sprite2D"), NodePath("CollisionShape2D")] diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index b754fd0..0a3c5c5 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -14,7 +14,7 @@ dock_split_1=0 dock_split_4=0 dock_2="FileSystem" dock_3="Scene,Import" -dock_5="Inspector,Node,History,Commit (20)" +dock_5="Inspector,Node,History,Commit (10)" [EditorNode] diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index cd75924..1314023 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,6 +1,6 @@ 2a60927148abd1d33b818b535e306557 -::res://::1677895091 -export_presets.cfg::TextFile::-1::1677836748::0::1::::<><>:: +::res://::1678090313 +export_presets.cfg::TextFile::-1::1678010409::0::1::::<><>:: README.md::TextFile::-1::1677829846::0::1::::<><>:: ::res://addons/::1677750379 ::res://addons/godot-git-plugin/::1677750379 @@ -18,22 +18,24 @@ Cupcake.png::CompressedTexture2D::2257367495948376976::1677756335::1677787255::1 ::res://Art/Locations/::1677787260 yard1.png::CompressedTexture2D::4372226739663751514::1677759042::1677787260::1::::<><>:: ::res://Art/Upgrades/::1677787246 -::res://Scenes/::1677919864 -game_world.tscn::PackedScene::7981802964863433317::1677919864::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>res://Scripts/PlayArea.gd -horse.tscn::PackedScene::8568825373134700876::1677919864::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke -::res://Scenes/Cupcakes/::1677919864 -cupcake.tscn::PackedScene::8468695979515826288::1677919864::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k -::res://Scenes/Locations/::1677919864 -yard.tscn::PackedScene::7883941411178408831::1677919864::0::1::::<><>::uid://b3j662tj6h5vq -::res://Scenes/UI/::1678001506 -ingame_ui.tscn::PackedScene::6815695514927101566::1678001506::0::1::::<><>:: -Upgrades.tscn::PackedScene::5871013436024621816::1678008873::0::1::::<><>:: -::res://Scripts/::1678001506 +::res://Scenes/::1678090225 +game_world.tscn::PackedScene::7981802964863433317::1678090225::0::1::::<><>::res://Scripts/game_world.gd<>res://Scripts/Cupcake Spawn Timer.gd<>uid://dswkgkor3yejo<>uid://cpv7y67qtmino<>res://Scripts/PlayArea.gd<>uid://c4dtrk2kooa6q +horse.tscn::PackedScene::8568825373134700876::1678090225::0::1::::<><>::res://Scripts/horse.gd<>uid://cbpvwmngdb4ke +::res://Scenes/Cupcakes/::1678090225 +cupcake.tscn::PackedScene::8468695979515826288::1678090225::0::1::::<><>::res://Scripts/Cupcakes/cupcake.gd<>uid://7fqro4fugv8k +::res://Scenes/Locations/::1678090225 +yard.tscn::PackedScene::7883941411178408831::1678090225::0::1::::<><>::uid://b3j662tj6h5vq +::res://Scenes/UI/::1678090225 +ingame_ui.tscn::PackedScene::6815695514927101566::1678090225::0::1::::<><>::res://Scripts/ingame_ui.gd<>uid://7fqro4fugv8k +upgrades.tscn::PackedScene::5871013436024621816::1678090225::0::1::::<><>::res://Scripts/upgrades.gd<>uid://7fqro4fugv8k +::res://Scripts/::1678090225 Cupcake Spawn Timer.gd::GDScript::-1::1677829748::0::1::::<>Timer<>:: -game_world.gd::GDScript::-1::1678001506::0::1::::<>Node2D<>:: -horse.gd::GDScript::-1::1677918740::0::1::::<>CharacterBody2D<>:: -PlayArea.gd::GDScript::-1::1677893017::0::1::::<>Area2D<>:: +game_world.gd::GDScript::-1::1678090225::0::1::::<>Node2D<>:: +horse.gd::GDScript::-1::1678073658::0::1::::<>CharacterBody2D<>:: +ingame_ui.gd::GDScript::-1::1678059546::0::1::::<>CanvasLayer<>:: +PlayArea.gd::GDScript::-1::1678064613::0::1::::<>Area2D<>:: +upgrades.gd::GDScript::-1::1678074136::0::1::::<>CanvasLayer<>:: varConst.gd::GDScript::-1::1677895026::0::1::::<>Node<>:: -varVar.gd::GDScript::-1::1677895074::0::1::::<>Node<>:: -::res://Scripts/Cupcakes/::1677890080 -cupcake.gd::GDScript::-1::1677890080::0::1::::<>RigidBody2D<>:: +varVar.gd::GDScript::-1::1678066992::0::1::::<>Node<>:: +::res://Scripts/Cupcakes/::1678073658 +cupcake.gd::GDScript::-1::1678073658::0::1::::<>RigidBody2D<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 8c9cf07..c447408 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,15 +1,7 @@ -res://Scripts/Cupcake Spawn Timer.gd res://Scenes/game_world.tscn res://Scripts/game_world.gd res://Scenes/horse.tscn res://Scenes/Cupcakes/cupcake.tscn -res://Scripts/horse.gd -res://Scripts/Cupcakes/cupcake.gd res://Scenes/Locations/yard.tscn -res://README.md -res://Scenes/UI/ingame_ui.tscn -res://Scripts/PlayArea.gd res://Scenes/UI/upgrades.tscn -res://Scripts/upgrades.gd -res://Scripts/ingame_ui.gd -res://Scripts/varVar.gd +res://Scenes/UI/ingame_ui.tscn diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 5aa956e..e6b43c5 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -1,6 +1,6 @@ [editor_metadata] -executable_path="/usr/bin/godot" +executable_path="/usr/bin/godot4" use_advanced_connections=true [debug_options] @@ -11,9 +11,9 @@ run_reload_scripts=true [dialog_bounds] project_settings=Rect2(814, 520, 1120, 920) -editor_settings=Rect2(830, 520, 900, 700) +editor_settings=Rect2(830, 550, 900, 700) search_help=Rect2(640, 390, 1280, 720) -export=Rect2(830, 460, 900, 700) +export=Rect2(830, 550, 900, 700) [color_picker] @@ -21,8 +21,8 @@ recent_presets=PackedColorArray(0.181189, 0.0715467, 0.241084, 1, 0.16746, 0.092 [recent_files] -scenes=["res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Locations/y.tscn", "res://Scenes/Locations/Yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/cupcake.tscn"] -scripts=["res://Scripts/varConst.gd", "res://Scripts/varVar.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/upgrades.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "Node", "res://Scripts/game_world.gd"] +scenes=["res://Scenes/UI/ingame_ui.tscn", "res://Scenes/UI/upgrades.tscn", "res://Scenes/Locations/yard.tscn", "res://Scenes/Cupcakes/cupcake.tscn", "res://Scenes/horse.tscn", "res://Scenes/game_world.tscn", "res://Scenes/UI/Upgrades.tscn", "res://Scenes/Locations/y.tscn", "res://Scenes/Locations/Yard.tscn", "res://Scenes/cupcake.tscn"] +scripts=["Node", "res://Scripts/varConst.gd", "res://Scripts/varVar.gd", "res://Scripts/ingame_ui.gd", "res://Scripts/upgrades.gd", "res://Scripts/PlayArea.gd", "res://README.md", "res://Scripts/Cupcakes/cupcake.gd", "res://Scripts/Cupcake Spawn Timer.gd", "res://Scripts/game_world.gd"] [script_setup] @@ -31,3 +31,7 @@ last_selected_language="GDScript" [project_settings] advanced_mode=true + +[export_options] + +default_filename="CupcakeRevolutionVersionZero" diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 1e319ee..4421e78 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,6 +1,6 @@ +/home/shobie/CupcakeRevolution1 res://Scenes/UI res://Scripts -/home/shobie/CupcakeRevolution1 res://Scenes/Locations res://Art/Locations res://Scripts/Cupcakes diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 60cddb7..fd87261 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,10 +17,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 31, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 107, +"row": 113, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -48,9 +48,13 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 25, +"row": 7, "scroll_position": 0.0, -"selection": false, +"selection": true, +"selection_from_column": 0, +"selection_from_line": 7, +"selection_to_column": 15, +"selection_to_line": 7, "syntax_highlighter": "GDScript" } diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 9f18001c93d7aa1bfc905d42c3f8bc816d8a6d2d..54b395f98a2dbe1c055f8c4087c8d3e665933a8a 100644 GIT binary patch delta 20 ccmZ3+@}G&3b0XuG$#slHlO>sWCvNoy07roa%m4rY delta 81 zcmey*w2Xz3cOv7K$tH~69CtfIPW8`UXfbiGv`}PXQHowkadKYEVZq6F3!du8PTVKW h2Nt=~^Gi|9qa++8GI2vWM`%HMQDRDJ@nkkeJpenOAXxwa diff --git a/Scenes/Cupcakes/cupcake.tscn b/Scenes/Cupcakes/cupcake.tscn index d51873a..a33c932 100644 --- a/Scenes/Cupcakes/cupcake.tscn +++ b/Scenes/Cupcakes/cupcake.tscn @@ -7,6 +7,7 @@ radius = 16.0 [node name="Cupcake" type="RigidBody2D"] +scale = Vector2(0.7, 0.7) collision_layer = 2 inertia = 0.17 gravity_scale = 0.0 diff --git a/Scenes/UI/ingame_ui.tscn b/Scenes/UI/ingame_ui.tscn index 41168a1..da77762 100644 --- a/Scenes/UI/ingame_ui.tscn +++ b/Scenes/UI/ingame_ui.tscn @@ -6,15 +6,16 @@ [node name="InGameUI" type="CanvasLayer"] script = ExtResource("1_q8tnv") -[node name="Main" type="Panel" parent="."] +[node name="Main" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 offset_left = 16.0 offset_top = 997.0 offset_right = 1908.0 offset_bottom = 1066.0 [node name="HBoxContainer" type="HBoxContainer" parent="Main"] -layout_mode = 1 -anchors_preset = 15 +layout_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 @@ -29,16 +30,16 @@ icon_alignment = 1 layout_mode = 2 text = "Choc" -[node name="Num" type="Panel" parent="."] -clip_children = 1 +[node name="Num" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 offset_left = 45.0 offset_top = 15.0 offset_right = 239.0 offset_bottom = 985.0 [node name="VBoxContainer" type="VBoxContainer" parent="Num"] -layout_mode = 1 -anchors_preset = 15 +layout_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 @@ -48,16 +49,17 @@ grow_vertical = 2 layout_mode = 2 text = "0" -[node name="Icons" type="Panel" parent="."] +[node name="Icons" type="Control" parent="."] clip_children = 1 +layout_mode = 3 +anchors_preset = 0 offset_left = 11.0 offset_top = 15.0 offset_right = 43.0 offset_bottom = 985.0 [node name="VBoxContainer" type="VBoxContainer" parent="Icons"] -layout_mode = 1 -anchors_preset = 15 +layout_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 diff --git a/Scenes/UI/upgrades.tscn b/Scenes/UI/upgrades.tscn index 801d033..9b7854b 100644 --- a/Scenes/UI/upgrades.tscn +++ b/Scenes/UI/upgrades.tscn @@ -37,6 +37,7 @@ text = "X" [node name="Control" type="Control" parent="."] layout_mode = 3 +anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -130,6 +131,7 @@ layout_mode = 2 text = "Buy" [node name="VScrollBar" type="VScrollBar" parent="Control"] +visible = false layout_mode = 2 anchor_left = 1.0 anchor_top = 0.033 diff --git a/Scenes/game_world.tscn b/Scenes/game_world.tscn index 985dc32..6c66896 100644 --- a/Scenes/game_world.tscn +++ b/Scenes/game_world.tscn @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://c4dtrk2kooa6q" path="res://Scenes/UI/ingame_ui.tscn" id="3_wm6l6"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_g5fj2"] -size = Vector2(1841, 1003) +size = Vector2(1820, 986) [node name="GameWorld" type="Node2D"] script = ExtResource("1_c2sx0") @@ -38,7 +38,7 @@ collision_mask = 3 script = ExtResource("3_3x1i6") [node name="CollisionShape2D" type="CollisionShape2D" parent="PlayArea"] -position = Vector2(961.5, 533.5) +position = Vector2(957, 539) shape = SubResource("RectangleShape2D_g5fj2") [connection signal="condensedCupcake1" from="." to="Cupcakes/Cupcake" method="_on_game_world_condensed_cupcake_1"] diff --git a/Scripts/game_world.gd b/Scripts/game_world.gd index deff1d5..4014539 100644 --- a/Scripts/game_world.gd +++ b/Scripts/game_world.gd @@ -91,7 +91,7 @@ func _on_upgrades_one_more_cupcake(): if ccVanNum >= ccVanPrice: ccSpawnRate += 1 ccVanNum -= ccVanPrice - ccVanPrice = ccVanPrice * PI + ccVanPrice = ccVanPrice * 1.3 $Upgrades/Control/ScrollContainer/VanGrid/VanUp1/Price.text = str(ccVanPrice) collectCupcakes() @@ -99,7 +99,7 @@ func _on_upgrades_one_more_cupcake(): func _on_upgrades_faster_cupcake(): if ccVanNum >= ccVanPrice2: ccVanNum -= ccVanPrice2 - ccVanPrice2 = ccVanPrice2 * PI + ccVanPrice2 = ccVanPrice2 * 1.3 timer.wait_time = timer.wait_time - (timer.wait_time * 0.01) $Upgrades/Control/ScrollContainer/VanGrid/VanUp2/Price.text = str(ccVanPrice2) collectCupcakes() @@ -107,7 +107,7 @@ func _on_upgrades_faster_cupcake(): func _on_upgrades_condensed_cupcake_1(): if ccVanNum >= ccVanPrice3: ccVanNum -= ccVanPrice3 - ccVanPrice3 = ccVanPrice3 * PI + ccVanPrice3 = ccVanPrice3 * 1.3 ccVanValue += 1 $Upgrades/Control/ScrollContainer/VanGrid/VanUp3/Price.text = str(ccVanPrice3) collectCupcakes() diff --git a/export_presets.cfg b/export_presets.cfg index 2d76d8a..945d365 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="" +export_path="../CupcakeRevolution1/CupcakeRevolutionVersionZero.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -20,12 +20,11 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" debug/export_console_script=1 -binary_format/embed_pck=false +binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false -texture_format/no_bptc_fallbacks=true binary_format/architecture="x86_64" ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip"