diff --git a/week4/README.md b/week4/README.md index e69de29..ed96e52 100644 --- a/week4/README.md +++ b/week4/README.md @@ -0,0 +1,26 @@ +This week we do: + +* Tilemaps +* Parallax Backgrounds +* Moving platforms + +## Tilemaps + +Up to now we have used the tilemap in a very basic way to be able to place some graphics into our game for walls and floors in our platformer. + +We are using simple StaticBodies with colliders to create collisions between our game objects like the player and those surfaces. This works well enough and is simple, but the tilemap has many more features we can use to build out levels quickly and easily - including the ability to define colliders right inside the individual tiles. + +To make use of these features, we need to expand our knowledge to include both TileSets and Terrains. + +## Parallax Background + +The Tilemap is a great feature, but graphics placed with it have a danger of feeling flat and boring on their own. The addition of a background can add a lot of atmosphere to your game. Godot includes a feature for making not only a background, but a repeating parallax background. + +Parallax backgrounds allow you to create background layers that repeat as your viewport moves around the scene. Furthermore, those layers can be moved relative to the player to create a wonderful feeling of depth - layers further away in the background move slower, whereas layers in the forground move fast. This simulates that way our eyes percieve depth, and it can make our worlds feels more vast. + + +### Resources +In-depth Tilemaps for Godot 4.2 +https://youtu.be/AUVsX-mtuNs?si=1aQU4nVyv_aJ9els +Best video for Parallax2D +https://youtu.be/3KnW9ATUsfA?si=cQwIO0bXs5btqIdd diff --git a/week4/original_project/.godot/editor/filesystem_cache8 b/week4/original_project/.godot/editor/filesystem_cache8 index 11ff5e4..e4a472f 100644 --- a/week4/original_project/.godot/editor/filesystem_cache8 +++ b/week4/original_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1722277810 +::res://::1724160549 icon.svg::CompressedTexture2D::9114977118871582245::1722277386::1722277386::1::::<><>:: ::res://graphics/::1722277386 Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1722277386::1722277386::1::::<><>:: @@ -13,11 +13,11 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1722277386::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1722277386::1722277386::1::::<><>:: ::res://graphics/Player Run/::1722277386 player run 48x48.png::CompressedTexture2D::1502492849971408816::1722277386::1722277386::1::::<><>:: -::res://scenes/::1722277386 -bullet.tscn::PackedScene::6880909734590904373::1722277386::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1722277386::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png -crate.tscn::PackedScene::41931541512830250::1722277386::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1722277386::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn +::res://scenes/::1724154451 +bullet.tscn::PackedScene::6880909734590904373::1724154451::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1724154451::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png +crate.tscn::PackedScene::41931541512830250::1724154451::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1724154451::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn ::res://scripts/::1722277386 bullet.gd::GDScript::-1::1722277386::0::1::::<>Area2D<>:: CharacterBody2D.gd::GDScript::-1::1722277386::0::1::::<>CharacterBody2D<>:: diff --git a/week4/updated_project/.godot/editor/filesystem_cache8 b/week4/updated_project/.godot/editor/filesystem_cache8 index a05835e..3ed4648 100644 --- a/week4/updated_project/.godot/editor/filesystem_cache8 +++ b/week4/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1723464540 +::res://::1724154523 icon.svg::CompressedTexture2D::9114977118871582245::1722277386::1722277386::1::::<><>:: ::res://graphics/::1722285155 Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1722277386::1722277386::1::::<><>:: @@ -17,12 +17,12 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1722277386::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1722277386::1722277386::1::::<><>:: ::res://graphics/Player Run/::1722277386 player run 48x48.png::CompressedTexture2D::1502492849971408816::1722277386::1722277386::1::::<><>:: -::res://scenes/::1722811662 -bullet.tscn::PackedScene::6880909734590904373::1722811662::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1722811662::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png -crate.tscn::PackedScene::41931541512830250::1722811662::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1722811662::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png -platform.tscn::PackedScene::8641027994130079701::1722811662::0::1::::<><>:: +::res://scenes/::1723464582 +bullet.tscn::PackedScene::6880909734590904373::1723464582::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1723464582::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png +crate.tscn::PackedScene::41931541512830250::1723464582::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1723464582::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png +platform.tscn::PackedScene::8641027994130079701::1723464582::0::1::::<><>:: ::res://scripts/::1722811640 bullet.gd::GDScript::-1::1722277386::0::1::::<>Area2D<>:: CharacterBody2D.gd::GDScript::-1::1722287010::0::1::::<>CharacterBody2D<>:: diff --git a/week5/README.md b/week5/README.md index e69de29..ca9d0e2 100644 --- a/week5/README.md +++ b/week5/README.md @@ -0,0 +1,7 @@ +This week we do: + +* Screen Settings +* Collectible items +* Enemies +* Player death +* Spawning Scenes \ No newline at end of file diff --git a/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg b/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg index 942dae0..77b7dda 100644 --- a/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg +++ b/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg @@ -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/CharacterBody2D/AnimatedSprite2D")]) +selected_nodes=Array[NodePath]([]) diff --git a/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index 915d802..b3b3605 100644 --- a/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg @@ -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/CharacterBody2D/AnimatedSprite2D")]) +selected_nodes=Array[NodePath]([]) diff --git a/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 6a24c40..06f70e7 100644 --- a/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -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/CharacterBody2D/AnimatedSprite2D")]) +selected_nodes=Array[NodePath]([]) diff --git a/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg b/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg index 41e20d0..99352e8 100644 --- a/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg +++ b/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg @@ -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/CharacterBody2D/AnimatedSprite2D")]) +selected_nodes=Array[NodePath]([]) diff --git a/week5/updated_project/.godot/editor/editor_layout.cfg b/week5/updated_project/.godot/editor/editor_layout.cfg index c163d3c..e23d9a3 100644 --- a/week5/updated_project/.godot/editor/editor_layout.cfg +++ b/week5/updated_project/.godot/editor/editor_layout.cfg @@ -32,7 +32,7 @@ current_scene="res://scenes/badguy.tscn" center_split_offset=-325 selected_default_debugger_tab_idx=0 selected_main_editor_idx=2 -selected_bottom_panel_item=9 +selected_bottom_panel_item=0 [ScriptEditor] diff --git a/week5/updated_project/.godot/editor/filesystem_cache8 b/week5/updated_project/.godot/editor/filesystem_cache8 index 55e6ad5..cd975f1 100644 --- a/week5/updated_project/.godot/editor/filesystem_cache8 +++ b/week5/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1723498498 +::res://::1724154758 icon.svg::CompressedTexture2D::9114977118871582245::1723471253::1723471253::1::::<><>:: ::res://graphics/::1723498498 coin.png::CompressedTexture2D::7063880403899111552::1723478773::1723478782::1::::<><>:: @@ -21,20 +21,20 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1723471253::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1723471253::1723471253::1::::<><>:: ::res://graphics/Player Run/::1723471253 player run 48x48.png::CompressedTexture2D::1502492849971408816::1723471253::1723471253::1::::<><>:: -::res://scenes/::1723498484 +::res://scenes/::1723498983 area_trigger.tscn::PackedScene::2953141911562060689::1723489409::0::1::::<><>::res://scripts/Trigger.gd -badguy.tscn::PackedScene::8923528729538756339::1723498062::0::1::::<><>::res://scripts/badguy.gd<>uid://c4g3ypigewuuu::::res://graphics/slime_green.png -bullet.tscn::PackedScene::6880909734590904373::1723498062::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1723498062::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png +badguy.tscn::PackedScene::8923528729538756339::1723498918::0::1::::<><>::res://scripts/badguy.gd<>uid://c4g3ypigewuuu::::res://graphics/slime_green.png +bullet.tscn::PackedScene::6880909734590904373::1723498918::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1723498983::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://bwnec1thq1btr::::res://graphics/Player Death/Player Death 64x64.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png coin.tscn::PackedScene::61828818800194477::1723489409::0::1::::<><>::uid://c7v2cwn2826lg::::res://graphics/coin.png<>res://scripts/coin.gd -crate.tscn::PackedScene::41931541512830250::1723498062::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1723498062::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://bicr20de8c3jp::::res://scenes/area_trigger.tscn<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png<>uid://47kuhu1ukph::::res://scenes/coin.tscn<>uid://d0evhj5ayp0ep::::res://scenes/badguy.tscn +crate.tscn::PackedScene::41931541512830250::1723498918::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1723498918::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn<>uid://dvd1p6xue0ub2::::res://scenes/platform.tscn<>uid://dly4g7fvvtamm::::res://graphics/background/BG Image.png<>uid://bicr20de8c3jp::::res://scenes/area_trigger.tscn<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png<>uid://47kuhu1ukph::::res://scenes/coin.tscn<>uid://d0evhj5ayp0ep::::res://scenes/badguy.tscn menu.tscn::PackedScene::1738029604261438007::1723489409::0::1::::<><>:: platform.tscn::PackedScene::8641027994130079701::1723489409::0::1::::<><>:: -::res://scripts/::1723498059 +::res://scripts/::1723498913 badguy.gd::GDScript::-1::1723497774::0::1::::<>Area2D<>:: bullet.gd::GDScript::-1::1723471253::0::1::::<>Area2D<>:: -CharacterBody2D.gd::GDScript::-1::1723498059::0::1::::<>CharacterBody2D<>:: +CharacterBody2D.gd::GDScript::-1::1723498913::0::1::::<>CharacterBody2D<>:: coin.gd::GDScript::-1::1723497967::0::1::::<>Area2D<>:: -gamecontroller.gd::GDScript::-1::1723497262::0::1::::<>Node<>:: +gamecontroller.gd::GDScript::-1::1723498727::0::1::::<>Node<>:: Trigger.gd::GDScript::-1::1723471253::0::1::::<>Area2D<>:: diff --git a/week5/updated_project/.godot/editor/filesystem_update4 b/week5/updated_project/.godot/editor/filesystem_update4 index ca35c5e..f329047 100644 --- a/week5/updated_project/.godot/editor/filesystem_update4 +++ b/week5/updated_project/.godot/editor/filesystem_update4 @@ -3,7 +3,3 @@ res://scenes/character.tscn res://scenes/bullet.tscn res://scenes/crate.tscn res://scenes/badguy.tscn -res://scripts/gamecontroller.gd -res://scripts/badguy.gd -res://scripts/coin.gd -res://scripts/CharacterBody2D.gd diff --git a/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 0815422..61d1ae6 100644 --- a/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -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/CharacterBody2D/AnimatedSprite2D")]) +selected_nodes=Array[NodePath]([]) diff --git a/week5/updated_project/.godot/editor/script_editor_cache.cfg b/week5/updated_project/.godot/editor/script_editor_cache.cfg index 2d2c78d..9935450 100644 --- a/week5/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week5/updated_project/.godot/editor/script_editor_cache.cfg @@ -73,11 +73,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 28, +"column": 31, "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 31, -"scroll_position": 21.0, +"scroll_position": 16.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/week5/updated_project/.godot/uid_cache.bin b/week5/updated_project/.godot/uid_cache.bin index 04c99b7..a8099d6 100644 Binary files a/week5/updated_project/.godot/uid_cache.bin and b/week5/updated_project/.godot/uid_cache.bin differ diff --git a/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg b/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg index 738a399..c09c14b 100644 --- a/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg +++ b/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg @@ -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/enemies")]) +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/UICanvas")]) diff --git a/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 85ade8a..b666c20 100644 --- a/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -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/enemies")]) +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/UICanvas")]) diff --git a/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg b/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg index d23210b..2acedb6 100644 --- a/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg +++ b/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg @@ -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/enemies")]) +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/UICanvas")]) diff --git a/week6/updated_project/.godot/editor/editor_layout.cfg b/week6/updated_project/.godot/editor/editor_layout.cfg index 3be6b00..2bbe573 100644 --- a/week6/updated_project/.godot/editor/editor_layout.cfg +++ b/week6/updated_project/.godot/editor/editor_layout.cfg @@ -4,7 +4,7 @@ dock_1_selected_tab_idx=0 dock_2_selected_tab_idx=0 dock_3_selected_tab_idx=0 dock_4_selected_tab_idx=0 -dock_5_selected_tab_idx=1 +dock_5_selected_tab_idx=0 dock_6_selected_tab_idx=0 dock_7_selected_tab_idx=0 dock_8_selected_tab_idx=0 @@ -19,16 +19,16 @@ dock_filesystem_split=0 dock_filesystem_display_mode=0 dock_filesystem_file_sort=0 dock_filesystem_file_list_display_mode=1 -dock_filesystem_selected_paths=PackedStringArray("res://graphics/fonts/PixelOperator8.ttf") -dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/resources/", "res://scripts/gameManager/", "res://graphics/", "res://graphics/fonts/") +dock_filesystem_selected_paths=PackedStringArray("res://scenes/ui.tscn") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scripts/resources/", "res://scripts/gameManager/", "res://scenes/", "res://graphics/fonts/") dock_3="Scene,Import" dock_4="FileSystem" dock_5="Inspector,Node,History" [EditorNode] -open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/badguy.tscn", "res://scenes/coin.tscn") -current_scene="res://scenes/game.tscn" +open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/badguy.tscn", "res://scenes/coin.tscn", "res://scenes/ui.tscn") +current_scene="res://scenes/ui.tscn" center_split_offset=-252 selected_default_debugger_tab_idx=0 selected_main_editor_idx=2 diff --git a/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 35a91e0..8149f32 100644 --- a/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -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/enemies")]) +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/UICanvas")]) diff --git a/week6/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/week6/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index 5598d34..89c1fa9 100644 --- a/week6/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week6/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -2,4 +2,4 @@ node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("layer__array", "tile_set"), NodePath("ParallaxBackground/ParallaxLayer"), PackedStringArray("Motion"), NodePath("ParallaxBackground/ParallaxLayer/Sprite2D"), PackedStringArray("Transform", "texture"), NodePath("Ground"), PackedStringArray("Transform"), NodePath("MovingPlatform"), PackedStringArray("Transform")] resource_unfolds=["res://scenes/game.tscn::TileSet_47g5u", PackedStringArray("terrain_set_0/terrain__array", "physics_layer__array"), "res://scenes/game.tscn::WorldBoundaryShape2D_xkyim", PackedStringArray(), "res://scenes/game.tscn::CircleShape2D_j8ltg", PackedStringArray()] -nodes_folded=[NodePath("SceneManager"), NodePath("ParallaxBackground"), NodePath("ParallaxBackground/ParallaxLayer"), NodePath("Ground"), NodePath("CharacterBody2D"), NodePath("crates"), NodePath("coins"), NodePath("enemies"), NodePath("BoxTrapTrigger"), NodePath("MovingPlatform"), NodePath("UICanvas")] +nodes_folded=[NodePath("SceneManager"), NodePath("ParallaxBackground"), NodePath("ParallaxBackground/ParallaxLayer"), NodePath("Ground"), NodePath("CharacterBody2D"), NodePath("crates"), NodePath("coins"), NodePath("BoxTrapTrigger"), NodePath("MovingPlatform"), NodePath("UICanvas")] diff --git a/week6/updated_project/.godot/editor/script_editor_cache.cfg b/week6/updated_project/.godot/editor/script_editor_cache.cfg index dbc2be4..920b4cc 100644 --- a/week6/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week6/updated_project/.godot/editor/script_editor_cache.cfg @@ -3,12 +3,16 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 32, +"column": 2, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 15, -"scroll_position": 3.0, -"selection": false, +"row": 57, +"scroll_position": 43.0, +"selection": true, +"selection_from_column": 1, +"selection_from_line": 57, +"selection_to_column": 2, +"selection_to_line": 57, "syntax_highlighter": "GDScript" } @@ -17,11 +21,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 36, +"column": 15, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 40, -"scroll_position": 0.0, +"row": 32, +"scroll_position": 119.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -45,10 +49,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 16, +"column": 14, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 8, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -73,10 +77,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 31, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 12, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -90,7 +94,7 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 6, +"row": 7, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -101,11 +105,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 1, +"column": 20, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 9, -"scroll_position": 3.0, +"row": 12, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/week6/updated_project/scenes/game.tscn b/week6/updated_project/scenes/game.tscn index 694f4f2..3e72e9b 100644 --- a/week6/updated_project/scenes/game.tscn +++ b/week6/updated_project/scenes/game.tscn @@ -591,6 +591,9 @@ position = Vector2(-28, 84) [node name="badguy2" parent="enemies" instance=ExtResource("11_ghgxt")] position = Vector2(270, -12) +[node name="Area2D" parent="enemies" instance=ExtResource("11_ghgxt")] +position = Vector2(363, -44) + [node name="BoxTrapTrigger" parent="." instance=ExtResource("7_i5ol2")] position = Vector2(126, -57)