diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index aeaee88..444b209 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -31,7 +31,7 @@ open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character. current_scene="res://scenes/game.tscn" center_split_offset=-304 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 +selected_main_editor_idx=0 selected_bottom_panel_item=0 [ScriptEditor] diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 756a2a3..ea3bb88 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1723508951 +::res://::1723511345 icon.svg::CompressedTexture2D::9114977118871582245::1723500338::1723500338::1::::<><>:: README.md::TextFile::-1::1723500338::0::1::::<><>:: ::res://graphics/::1723508951 @@ -18,18 +18,18 @@ Player Death 64x64.png::CompressedTexture2D::4461411006036685561::1723508981::17 Player Idle 48x48.png::CompressedTexture2D::3529809544777189649::1723500338::1723508951::1::::<><>:: player jump 48x48.png::CompressedTexture2D::3342890448265989669::1723500338::1723508951::1::::<><>:: player run 48x48.png::CompressedTexture2D::2400852804432818940::1723500338::1723508951::1::::<><>:: -::res://scenes/::1723508954 -badguy.tscn::PackedScene::1001283511600753306::1723508878::0::1::::<><>::res://scripts/badguy.gd<>uid://qwx0hufw5cxp::::res://graphics/slime_purple.png -bullet.tscn::PackedScene::6880909734590904373::1723508878::0::1::::<><>::res://scripts/bullet.gd<>uid://b43xjkoc8qrmv::::res://graphics/bullet.png -character.tscn::PackedScene::451838158579532324::1723508954::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://bqj4phkget2pp::::res://graphics/player animations/Player Idle 48x48.png<>uid://bnvk6gm188vsv::::res://graphics/player animations/player jump 48x48.png<>uid://bag8xvlev6yxg::::res://graphics/player animations/player run 48x48.png -coin.tscn::PackedScene::39001951564700926::1723508878::0::1::::<><>::uid://dxxynldiswq5g::::res://graphics/pickups/coin.png<>res://scripts/coin.gd -crate.tscn::PackedScene::7138073747019797840::1723508878::0::1::::<><>::uid://dt5nh26eq2a5r::::res://graphics/crate.png -game.tscn::PackedScene::1738196330916037717::1723508878::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://c43jfkjw11rsq::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://c8x0bcxa8t74o::::res://scenes/crate.tscn<>uid://biqrhb0shtygr::::res://graphics/background/BG Image.png<>uid://bp4mp3bh45b6i::::res://graphics/background/Additional Sky.png<>uid://byl5umyabyltt::::res://graphics/background/Additional Water.png<>uid://cdgbcjrseeoka::::res://scenes/platform.tscn<>uid://s5mebw76f4y::::res://scenes/coin.tscn<>uid://oja81cvx8jvu::::res://scenes/badguy.tscn -platform.tscn::PackedScene::4995858953200417260::1723508878::0::1::::<><>:: -::res://scripts/::1723508876 +::res://scenes/::1723510759 +badguy.tscn::PackedScene::1001283511600753306::1723510759::0::1::::<><>::res://scripts/badguy.gd<>uid://qwx0hufw5cxp::::res://graphics/slime_purple.png +bullet.tscn::PackedScene::6880909734590904373::1723510759::0::1::::<><>::res://scripts/bullet.gd<>uid://b43xjkoc8qrmv::::res://graphics/bullet.png +character.tscn::PackedScene::451838158579532324::1723510759::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://bqj4phkget2pp::::res://graphics/player animations/Player Idle 48x48.png<>uid://b4te11j5ut62p::::res://graphics/player animations/Player Death 64x64.png<>uid://bnvk6gm188vsv::::res://graphics/player animations/player jump 48x48.png<>uid://bag8xvlev6yxg::::res://graphics/player animations/player run 48x48.png +coin.tscn::PackedScene::39001951564700926::1723510759::0::1::::<><>::uid://dxxynldiswq5g::::res://graphics/pickups/coin.png<>res://scripts/coin.gd +crate.tscn::PackedScene::7138073747019797840::1723510759::0::1::::<><>::uid://dt5nh26eq2a5r::::res://graphics/crate.png +game.tscn::PackedScene::1738196330916037717::1723510759::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://c43jfkjw11rsq::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://c8x0bcxa8t74o::::res://scenes/crate.tscn<>uid://biqrhb0shtygr::::res://graphics/background/BG Image.png<>uid://bp4mp3bh45b6i::::res://graphics/background/Additional Sky.png<>uid://byl5umyabyltt::::res://graphics/background/Additional Water.png<>uid://cdgbcjrseeoka::::res://scenes/platform.tscn<>uid://s5mebw76f4y::::res://scenes/coin.tscn<>uid://oja81cvx8jvu::::res://scenes/badguy.tscn +platform.tscn::PackedScene::4995858953200417260::1723510759::0::1::::<><>:: +::res://scripts/::1723510638 badguy.gd::GDScript::-1::1723508876::0::1::::<>Area2D<>:: bullet.gd::GDScript::-1::1723500338::0::1::::<>Area2D<>:: -CharacterBody2D.gd::GDScript::-1::1723504296::0::1::::<>CharacterBody2D<>:: +CharacterBody2D.gd::GDScript::-1::1723510459::0::1::::<>CharacterBody2D<>:: coin.gd::GDScript::-1::1723504919::0::1::::<>Area2D<>:: -gamecontroller.gd::GDScript::-1::1723508737::0::1::::<>Node<>:: +gamecontroller.gd::GDScript::-1::1723510638::0::1::::<>Node<>:: Trigger.gd::GDScript::-1::1723505565::0::1::::<>Area2D<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 9bc33c9..ca76e78 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,12 +1,3 @@ res://scenes/game.tscn -res://scenes/character.tscn -res://scenes/bullet.tscn -res://scenes/crate.tscn -res://scenes/platform.tscn -res://scenes/coin.tscn -res://scripts/coin.gd res://scripts/gamecontroller.gd -res://scripts/CharacterBody2D.gd res://scripts/Trigger.gd -res://scenes/badguy.tscn -res://scripts/badguy.gd diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 348d9fe..fc8b52a 100644 --- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-234.664, -212.684), +"ofs": Vector2(105.687, 346.914), "primary_grid_step": Vector2i(8, 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": 1.7818 +"zoom": 6.3496 } 3D={ "fov": 70.01, @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/GameController/Timer")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game/Area2D2")]) diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 71c0966..04db65a 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -15,7 +15,7 @@ run_deploy_remote_debug=false [recent_files] -scenes=["res://scenes/character.tscn", "res://scenes/badguy.tscn", "res://scenes/coin.tscn", "res://scenes/platform.tscn", "res://scenes/crate.tscn", "res://scenes/bullet.tscn", "res://scenes/game.tscn"] +scenes=["res://scenes/badguy.tscn", "res://scenes/coin.tscn", "res://scenes/platform.tscn", "res://scenes/crate.tscn", "res://scenes/bullet.tscn", "res://scenes/character.tscn", "res://scenes/game.tscn"] scripts=["res://scripts/badguy.gd", "res://scripts/coin.gd", "res://scripts/Trigger.gd", "res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/gamecontroller.gd"] [linked_properties] diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 7b535d8..b639d0c 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 31, +"column": 13, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 40, -"scroll_position": 20.0, +"row": 36, +"scroll_position": 10.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -73,10 +73,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 13, +"column": 20, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 38, +"row": 39, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index efd3713..e196211 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/scenes/game.tscn b/scenes/game.tscn index c53b5c1..b73b6f5 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -642,7 +642,7 @@ position = Vector2(507, 403) position = Vector2(592, 176) [node name="Area2D2" parent="." instance=ExtResource("11_8t7ny")] -position = Vector2(187, 404) +position = Vector2(197, 404) [connection signal="timeout" from="GameController/Timer" to="GameController" method="resetWorld"] [connection signal="areatrigger" from="Area2D" to="GameController" method="_on_area_2d_areatrigger"]