diff --git a/graphics_assets/terrains/Basic Tilemap.png b/graphics_assets/terrains/Basic Tilemap.png new file mode 100644 index 0000000..50935cf Binary files /dev/null and b/graphics_assets/terrains/Basic Tilemap.png differ diff --git a/graphics_assets/terrains/Terrain (32x32).png b/graphics_assets/terrains/Terrain (32x32).png new file mode 100755 index 0000000..ddf1eaf Binary files /dev/null and b/graphics_assets/terrains/Terrain (32x32).png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Additional Sky.png b/graphics_assets/terrains/backgrounds/piratebay/Additional Sky.png new file mode 100755 index 0000000..46e400f Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Additional Sky.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Additional Water.png b/graphics_assets/terrains/backgrounds/piratebay/Additional Water.png new file mode 100755 index 0000000..591e481 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Additional Water.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/BG Image.png b/graphics_assets/terrains/backgrounds/piratebay/BG Image.png new file mode 100755 index 0000000..3f2a66c Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/BG Image.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Big Clouds.png b/graphics_assets/terrains/backgrounds/piratebay/Big Clouds.png new file mode 100755 index 0000000..c46d958 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Big Clouds.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 1.png b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 1.png new file mode 100755 index 0000000..ae48730 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 1.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 2.png b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 2.png new file mode 100755 index 0000000..7b4369b Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 2.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 3.png b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 3.png new file mode 100755 index 0000000..d14f87c Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Small Cloud 3.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 01.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 01.png new file mode 100755 index 0000000..7a6f5ba Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 01.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 02.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 02.png new file mode 100755 index 0000000..4bdd543 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 02.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 03.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 03.png new file mode 100755 index 0000000..405b1c6 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 03.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 04.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 04.png new file mode 100755 index 0000000..55e75e5 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Big 04.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 01.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 01.png new file mode 100755 index 0000000..fca2dee Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 01.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 02.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 02.png new file mode 100755 index 0000000..e743b77 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 02.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 03.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 03.png new file mode 100755 index 0000000..aff1f8c Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 03.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 04.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 04.png new file mode 100755 index 0000000..295432b Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Medium 04.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 01.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 01.png new file mode 100755 index 0000000..c4c684e Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 01.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 02.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 02.png new file mode 100755 index 0000000..d4484d5 Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 02.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 03.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 03.png new file mode 100755 index 0000000..2b7425d Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 03.png differ diff --git a/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 04.png b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 04.png new file mode 100755 index 0000000..2c9043f Binary files /dev/null and b/graphics_assets/terrains/backgrounds/piratebay/Water Reflect Small 04.png differ diff --git a/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index 509ae26..b631069 100644 --- a/week4/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/week4/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/Game/level/StaticBody2D")]) +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/Platform")]) diff --git a/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 19d4e2b..41c2282 100644 --- a/week4/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week4/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/level/StaticBody2D")]) +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/Platform")]) diff --git a/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg b/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg index b6c6933..5e116cc 100644 --- a/week4/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg +++ b/week4/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/Game/level/StaticBody2D")]) +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/Platform")]) diff --git a/week4/updated_project/.godot/editor/create_recent.Node b/week4/updated_project/.godot/editor/create_recent.Node index 98162bc..a387969 100644 --- a/week4/updated_project/.godot/editor/create_recent.Node +++ b/week4/updated_project/.godot/editor/create_recent.Node @@ -1,6 +1,10 @@ +AnimationPlayer CollisionShape2D -StaticBody2D +AnimatableBody2D Sprite2D +ParallaxLayer +ParallaxBackground +StaticBody2D Camera2D TileMap Node diff --git a/week4/updated_project/.godot/editor/editor_layout.cfg b/week4/updated_project/.godot/editor/editor_layout.cfg index a3155c6..f03a81e 100644 --- a/week4/updated_project/.godot/editor/editor_layout.cfg +++ b/week4/updated_project/.godot/editor/editor_layout.cfg @@ -19,20 +19,20 @@ 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/items/cannister.png") -dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/items/") +dock_filesystem_selected_paths=PackedStringArray("res://scenes/platform.tscn") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/background/") 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/bullet.tscn", "res://scenes/crate.tscn") +open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn", "res://scenes/crate.tscn", "res://scenes/platform.tscn") current_scene="res://scenes/game.tscn" center_split_offset=-325 selected_default_debugger_tab_idx=0 selected_main_editor_idx=0 -selected_bottom_panel_item=12 +selected_bottom_panel_item=0 [ScriptEditor] diff --git a/week4/updated_project/.godot/editor/filesystem_cache8 b/week4/updated_project/.godot/editor/filesystem_cache8 index ffdc656..b3a9303 100644 --- a/week4/updated_project/.godot/editor/filesystem_cache8 +++ b/week4/updated_project/.godot/editor/filesystem_cache8 @@ -1,8 +1,12 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1722277971 +::res://::1722285155 icon.svg::CompressedTexture2D::9114977118871582245::1722277386::1722277386::1::::<><>:: -::res://graphics/::1722277386 +::res://graphics/::1722285155 Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1722277386::1722277386::1::::<><>:: +::res://graphics/background/::1722285354 +Additional Sky.png::CompressedTexture2D::6380466891628860263::1722285151::1722285155::1::::<><>:: +Additional Water.png::CompressedTexture2D::2205427413754203696::1722285223::1722285223::1::::<><>:: +BG Image.png::CompressedTexture2D::7982657594202931692::1722285354::1722285354::1::::<><>:: ::res://graphics/items/::1722277386 cannister.png::CompressedTexture2D::7418095402531000042::1722277386::1722277386::1::::<><>:: ::res://graphics/Player Idle/::1722277386 @@ -13,11 +17,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/::1722285264 +bullet.tscn::PackedScene::6880909734590904373::1722285264::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1722285264::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::1722285264::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1722285264::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://cw50mfjp2np08::::res://graphics/background/Additional Sky.png<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://6olcj1w1svdg::::res://graphics/background/Additional Water.png<>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_update4 b/week4/updated_project/.godot/editor/filesystem_update4 index 5393c1d..5290c05 100644 --- a/week4/updated_project/.godot/editor/filesystem_update4 +++ b/week4/updated_project/.godot/editor/filesystem_update4 @@ -2,3 +2,5 @@ res://scenes/game.tscn res://scenes/character.tscn res://scenes/bullet.tscn res://scenes/crate.tscn +res://scripts/CharacterBody2D.gd +res://scenes/platform.tscn diff --git a/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index ebd3f35..ffac810 100644 --- a/week4/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week4/updated_project/.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(-271.671, -139.035), +"ofs": Vector2(-239.851, -147.52), "primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, @@ -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/level/StaticBody2D")]) +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/Platform")]) diff --git a/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index d80f69b..8b146f6 100644 --- a/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week4/updated_project/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("layer__array", "tile_set"), NodePath("level"), PackedStringArray("Transform"), NodePath("AreaTrigger"), PackedStringArray("Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("layer__array", "tile_set"), NodePath("level"), PackedStringArray("Transform"), NodePath("AreaTrigger"), PackedStringArray("Transform"), NodePath("Platform"), 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_x8qck", PackedStringArray("Resource")] -nodes_folded=[NodePath("CharacterBody2D"), NodePath("AreaTrigger")] +nodes_folded=[NodePath("level"), NodePath("CharacterBody2D"), NodePath("AreaTrigger")] diff --git a/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg b/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg new file mode 100644 index 0000000..ec4c3c1 --- /dev/null +++ b/week4/updated_project/.godot/editor/platform.tscn-editstate-cc2f727180cd42d9c13434cb55b1ce69.cfg @@ -0,0 +1,175 @@ +[editor_states] + +Anim={ +"visible": true +} +2D={ +"grid_offset": Vector2(0, 0), +"grid_snap_active": false, +"grid_step": Vector2(8, 8), +"grid_visibility": 1, +"ofs": Vector2(-165.704, -171.293), +"primary_grid_step": Vector2i(8, 8), +"show_edit_locks": true, +"show_guides": true, +"show_helpers": false, +"show_origin": true, +"show_rulers": true, +"show_transformation_gizmos": true, +"show_viewport": true, +"show_zoom_control": true, +"smart_snap_active": false, +"snap_guides": true, +"snap_node_anchors": true, +"snap_node_center": true, +"snap_node_parent": true, +"snap_node_sides": true, +"snap_other_nodes": true, +"snap_pixel": true, +"snap_relative": false, +"snap_rotation": false, +"snap_rotation_offset": 0.0, +"snap_rotation_step": 0.261799, +"snap_scale": false, +"snap_scale_step": 0.1, +"zoom": 1.88775 +} +3D={ +"fov": 70.01, +"gizmos_status": { +"AudioListener3D": 0, +"AudioStreamPlayer3D": 0, +"CPUParticles3D": 0, +"CSGShape3D": 0, +"Camera3D": 0, +"CollisionObject3D": 0, +"CollisionPolygon3D": 0, +"CollisionShape3D": 0, +"Decal": 0, +"FogVolume": 0, +"GPUParticles3D": 0, +"GPUParticlesCollision3D": 0, +"Joint3D": 0, +"Light3D": 0, +"LightmapGI": 0, +"LightmapProbe": 0, +"Marker3D": 0, +"NavigationLink3D": 0, +"NavigationRegion3D": 0, +"OccluderInstance3D": 0, +"Path3D": 0, +"PhysicalBone3D": 0, +"RayCast3D": 0, +"ReflectionProbe": 0, +"ShapeCast3D": 0, +"Skeleton3D": 0, +"SoftBody3D": 0, +"SpringArm3D": 0, +"VehicleWheel3D": 0, +"VisibleOnScreenNotifier3D": 0, +"VoxelGI": 0 +}, +"local_coords": false, +"preview_sun_env": { +"environ_ao_enabled": false, +"environ_enabled": true, +"environ_energy": 1.0, +"environ_gi_enabled": false, +"environ_glow_enabled": true, +"environ_ground_color": Color(0.2, 0.169, 0.133, 1), +"environ_sky_color": Color(0.385, 0.454, 0.55, 1), +"environ_tonemap_enabled": true, +"sun_color": Color(1, 1, 1, 1), +"sun_enabled": true, +"sun_energy": 1.0, +"sun_max_distance": 100.0, +"sun_rotation": Vector2(-1.0472, 2.61799) +}, +"rotate_snap": 15.0, +"scale_snap": 10.0, +"show_grid": true, +"show_origin": true, +"snap_enabled": false, +"translate_snap": 1.0, +"viewport_mode": 1, +"viewports": [{ +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": true, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 20, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}], +"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/Platform")]) diff --git a/week4/updated_project/.godot/editor/platform.tscn-folding-cc2f727180cd42d9c13434cb55b1ce69.cfg b/week4/updated_project/.godot/editor/platform.tscn-folding-cc2f727180cd42d9c13434cb55b1ce69.cfg new file mode 100644 index 0000000..299c478 --- /dev/null +++ b/week4/updated_project/.godot/editor/platform.tscn-folding-cc2f727180cd42d9c13434cb55b1ce69.cfg @@ -0,0 +1,5 @@ +[folding] + +node_unfolds=[] +resource_unfolds=["res://scenes/platform.tscn::RectangleShape2D_i20vp", PackedStringArray()] +nodes_folded=[] diff --git a/week4/updated_project/.godot/editor/project_metadata.cfg b/week4/updated_project/.godot/editor/project_metadata.cfg index 749df93..c83226a 100644 --- a/week4/updated_project/.godot/editor/project_metadata.cfg +++ b/week4/updated_project/.godot/editor/project_metadata.cfg @@ -14,7 +14,7 @@ run_debug_collisions=true [recent_files] -scenes=["res://scenes/crate.tscn", "res://scenes/bullet.tscn", "res://scenes/character.tscn", "res://scenes/game.tscn"] +scenes=["res://scenes/platform.tscn", "res://scenes/crate.tscn", "res://scenes/bullet.tscn", "res://scenes/character.tscn", "res://scenes/game.tscn"] scripts=["res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/gamecontroller.gd"] [linked_properties] @@ -32,6 +32,11 @@ TileMap:scale=true Camera2D:zoom=true Camera2D:scale=true Sprite2D:scale=true +ParallaxBackground:scroll_base_scale=true +ParallaxBackground:scale=true +ParallaxLayer:motion_scale=true +ParallaxLayer:scale=true +AnimatableBody2D:scale=true [dialog_bounds] diff --git a/week4/updated_project/.godot/editor/script_editor_cache.cfg b/week4/updated_project/.godot/editor/script_editor_cache.cfg index 4a671f1..3b57a53 100644 --- a/week4/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week4/updated_project/.godot/editor/script_editor_cache.cfg @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 31, -"folded_lines": Array[int]([]), +"column": 26, +"folded_lines": Array[int]([76, 84, 87, 93]), "h_scroll_position": 0, -"row": 46, -"scroll_position": 0.0, +"row": 53, +"scroll_position": 44.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.ctex b/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.ctex new file mode 100644 index 0000000..28f01e6 Binary files /dev/null and b/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.ctex differ diff --git a/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.md5 b/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.md5 new file mode 100644 index 0000000..813be63 --- /dev/null +++ b/week4/updated_project/.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.md5 @@ -0,0 +1,3 @@ +source_md5="ef05607ab18b6e14047ef305d4967bca" +dest_md5="c4a79c607243be25d3669dc2144fdbe8" + diff --git a/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.ctex b/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.ctex new file mode 100644 index 0000000..28f01e6 Binary files /dev/null and b/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.ctex differ diff --git a/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.md5 b/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.md5 new file mode 100644 index 0000000..813be63 --- /dev/null +++ b/week4/updated_project/.godot/imported/Additional Sky.png-4683357939bfb8be7cfcbc8cef15562a.md5 @@ -0,0 +1,3 @@ +source_md5="ef05607ab18b6e14047ef305d4967bca" +dest_md5="c4a79c607243be25d3669dc2144fdbe8" + diff --git a/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.ctex b/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.ctex new file mode 100644 index 0000000..bed577d Binary files /dev/null and b/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.ctex differ diff --git a/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.md5 b/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.md5 new file mode 100644 index 0000000..3ab7479 --- /dev/null +++ b/week4/updated_project/.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.md5 @@ -0,0 +1,3 @@ +source_md5="707fe1be51389c0a7dc6bce6b8df1ad8" +dest_md5="a1f827ff5491bfc85a30898cd8164541" + diff --git a/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.ctex b/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.ctex new file mode 100644 index 0000000..224819e Binary files /dev/null and b/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.ctex differ diff --git a/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.md5 b/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.md5 new file mode 100644 index 0000000..0a89380 --- /dev/null +++ b/week4/updated_project/.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.md5 @@ -0,0 +1,3 @@ +source_md5="7f10db4045810c42977343e59a782178" +dest_md5="c50c902db0eea75f65be64479d81b3ae" + diff --git a/week4/updated_project/.godot/uid_cache.bin b/week4/updated_project/.godot/uid_cache.bin index 94fa2a4..3664765 100644 Binary files a/week4/updated_project/.godot/uid_cache.bin and b/week4/updated_project/.godot/uid_cache.bin differ diff --git a/week4/updated_project/graphics/background/Additional Sky.png b/week4/updated_project/graphics/background/Additional Sky.png new file mode 100644 index 0000000..46e400f Binary files /dev/null and b/week4/updated_project/graphics/background/Additional Sky.png differ diff --git a/week4/updated_project/graphics/background/Additional Sky.png.import b/week4/updated_project/graphics/background/Additional Sky.png.import new file mode 100644 index 0000000..14779b5 --- /dev/null +++ b/week4/updated_project/graphics/background/Additional Sky.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cw50mfjp2np08" +path="res://.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/background/Additional Sky.png" +dest_files=["res://.godot/imported/Additional Sky.png-0c545090cde9f2fc7e943a672b099c59.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/week4/updated_project/graphics/background/Additional Water.png b/week4/updated_project/graphics/background/Additional Water.png new file mode 100644 index 0000000..591e481 Binary files /dev/null and b/week4/updated_project/graphics/background/Additional Water.png differ diff --git a/week4/updated_project/graphics/background/Additional Water.png.import b/week4/updated_project/graphics/background/Additional Water.png.import new file mode 100644 index 0000000..0dd436e --- /dev/null +++ b/week4/updated_project/graphics/background/Additional Water.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://6olcj1w1svdg" +path="res://.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/background/Additional Water.png" +dest_files=["res://.godot/imported/Additional Water.png-bf782f3705a1acaec1e3ab97da39a373.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/week4/updated_project/graphics/background/BG Image.png b/week4/updated_project/graphics/background/BG Image.png new file mode 100644 index 0000000..3f2a66c Binary files /dev/null and b/week4/updated_project/graphics/background/BG Image.png differ diff --git a/week4/updated_project/graphics/background/BG Image.png.import b/week4/updated_project/graphics/background/BG Image.png.import new file mode 100644 index 0000000..e84932a --- /dev/null +++ b/week4/updated_project/graphics/background/BG Image.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dly4g7fvvtamm" +path="res://.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/background/BG Image.png" +dest_files=["res://.godot/imported/BG Image.png-a4c16c98f815c26fe14456abfb54be92.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/week4/updated_project/scenes/game.tscn b/week4/updated_project/scenes/game.tscn index 5dff594..374d008 100644 --- a/week4/updated_project/scenes/game.tscn +++ b/week4/updated_project/scenes/game.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=10 format=3 uid="uid://y083suj12rld"] +[gd_scene load_steps=14 format=3 uid="uid://y083suj12rld"] [ext_resource type="Script" path="res://scripts/gamecontroller.gd" id="1_77wyw"] [ext_resource type="PackedScene" uid="uid://go4yc8hfo1gq" path="res://scenes/character.tscn" id="2_64ccm"] [ext_resource type="Texture2D" uid="uid://dwb83f7uoweuy" path="res://graphics/Terrain (32x32).png" id="2_l22q1"] [ext_resource type="Script" path="res://scripts/Trigger.gd" id="2_nfj1w"] [ext_resource type="PackedScene" uid="uid://ukuu7p7vhlq" path="res://scenes/crate.tscn" id="5_u8rgi"] +[ext_resource type="PackedScene" uid="uid://dvd1p6xue0ub2" path="res://scenes/platform.tscn" id="6_bcgm6"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_xg6qs"] texture = ExtResource("2_l22q1") @@ -71,21 +72,55 @@ texture_region_size = Vector2i(32, 32) 7:0/0/terrains_peering_bit/top_right_corner = 0 9:0/0 = 0 9:0/0/terrain_set = 0 +9:0/0/terrain = 0 9:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:0/0/physics_layer_0/angular_velocity = 0.0 +9:0/0/terrains_peering_bit/right_side = 0 +9:0/0/terrains_peering_bit/bottom_right_corner = 0 +9:0/0/terrains_peering_bit/bottom_side = 0 +9:0/0/terrains_peering_bit/bottom_left_corner = 0 +9:0/0/terrains_peering_bit/left_side = 0 +9:0/0/terrains_peering_bit/top_side = 0 10:0/0 = 0 10:0/0/terrain_set = 0 +10:0/0/terrain = 0 10:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:0/0/physics_layer_0/angular_velocity = 0.0 +10:0/0/terrains_peering_bit/right_side = 0 +10:0/0/terrains_peering_bit/bottom_side = 0 +10:0/0/terrains_peering_bit/bottom_left_corner = 0 +10:0/0/terrains_peering_bit/left_side = 0 +10:0/0/terrains_peering_bit/top_left_corner = 0 +10:0/0/terrains_peering_bit/top_side = 0 12:0/0 = 0 +12:0/0/terrain_set = 0 +12:0/0/terrain = 0 12:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:0/0/physics_layer_0/angular_velocity = 0.0 +12:0/0/terrains_peering_bit/right_side = 0 +12:0/0/terrains_peering_bit/bottom_right_corner = 0 +12:0/0/terrains_peering_bit/bottom_side = 0 +12:0/0/terrains_peering_bit/left_side = 0 +12:0/0/terrains_peering_bit/top_side = 0 13:0/0 = 0 +13:0/0/terrain_set = 0 +13:0/0/terrain = 0 13:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:0/0/physics_layer_0/angular_velocity = 0.0 +13:0/0/terrains_peering_bit/right_side = 0 +13:0/0/terrains_peering_bit/bottom_side = 0 +13:0/0/terrains_peering_bit/bottom_left_corner = 0 +13:0/0/terrains_peering_bit/left_side = 0 +13:0/0/terrains_peering_bit/top_side = 0 15:0/0 = 0 +15:0/0/terrain_set = 0 +15:0/0/terrain = 0 15:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:0/0/physics_layer_0/angular_velocity = 0.0 +15:0/0/terrains_peering_bit/right_side = 0 +15:0/0/terrains_peering_bit/bottom_side = 0 +15:0/0/terrains_peering_bit/left_side = 0 +15:0/0/terrains_peering_bit/top_side = 0 0:1/0 = 0 0:1/0/terrain_set = 0 0:1/0/terrain = 0 @@ -154,23 +189,69 @@ texture_region_size = Vector2i(32, 32) 7:1/0/terrains_peering_bit/top_side = 0 7:1/0/terrains_peering_bit/top_right_corner = 0 9:1/0 = 0 +9:1/0/terrain_set = 0 +9:1/0/terrain = 0 9:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:1/0/physics_layer_0/angular_velocity = 0.0 +9:1/0/terrains_peering_bit/right_side = 0 +9:1/0/terrains_peering_bit/bottom_right_corner = 0 +9:1/0/terrains_peering_bit/bottom_side = 0 +9:1/0/terrains_peering_bit/left_side = 0 +9:1/0/terrains_peering_bit/top_side = 0 +9:1/0/terrains_peering_bit/top_right_corner = 0 10:1/0 = 0 +10:1/0/terrain_set = 0 +10:1/0/terrain = 0 10:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:1/0/physics_layer_0/angular_velocity = 0.0 +10:1/0/terrains_peering_bit/right_side = 0 +10:1/0/terrains_peering_bit/bottom_side = 0 +10:1/0/terrains_peering_bit/left_side = 0 +10:1/0/terrains_peering_bit/top_left_corner = 0 +10:1/0/terrains_peering_bit/top_side = 0 +10:1/0/terrains_peering_bit/top_right_corner = 0 12:1/0 = 0 +12:1/0/terrain_set = 0 +12:1/0/terrain = 0 12:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:1/0/physics_layer_0/angular_velocity = 0.0 +12:1/0/terrains_peering_bit/right_side = 0 +12:1/0/terrains_peering_bit/bottom_side = 0 +12:1/0/terrains_peering_bit/left_side = 0 +12:1/0/terrains_peering_bit/top_side = 0 +12:1/0/terrains_peering_bit/top_right_corner = 0 13:1/0 = 0 +13:1/0/terrain_set = 0 +13:1/0/terrain = 0 13:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:1/0/physics_layer_0/angular_velocity = 0.0 +13:1/0/terrains_peering_bit/right_side = 0 +13:1/0/terrains_peering_bit/bottom_side = 0 +13:1/0/terrains_peering_bit/left_side = 0 +13:1/0/terrains_peering_bit/top_left_corner = 0 +13:1/0/terrains_peering_bit/top_side = 0 15:1/0 = 0 +15:1/0/terrain_set = 0 +15:1/0/terrain = 0 15:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:1/0/physics_layer_0/angular_velocity = 0.0 +15:1/0/terrains_peering_bit/right_side = 0 +15:1/0/terrains_peering_bit/bottom_side = 0 +15:1/0/terrains_peering_bit/bottom_left_corner = 0 +15:1/0/terrains_peering_bit/left_side = 0 +15:1/0/terrains_peering_bit/top_side = 0 +15:1/0/terrains_peering_bit/top_right_corner = 0 16:1/0 = 0 +16:1/0/terrain_set = 0 +16:1/0/terrain = 0 16:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:1/0/physics_layer_0/angular_velocity = 0.0 +16:1/0/terrains_peering_bit/right_side = 0 +16:1/0/terrains_peering_bit/bottom_right_corner = 0 +16:1/0/terrains_peering_bit/bottom_side = 0 +16:1/0/terrains_peering_bit/left_side = 0 +16:1/0/terrains_peering_bit/top_left_corner = 0 +16:1/0/terrains_peering_bit/top_side = 0 0:2/0 = 0 0:2/0/terrain_set = 0 0:2/0/terrain = 0 @@ -208,37 +289,83 @@ texture_region_size = Vector2i(32, 32) 4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 4:2/0/terrains_peering_bit/top_side = 0 6:3/0 = 0 +6:3/0/terrain_set = 0 +6:3/0/terrain = 0 6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:3/0/physics_layer_0/angular_velocity = 0.0 6:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +6:3/0/terrains_peering_bit/right_side = 0 +6:3/0/terrains_peering_bit/bottom_right_corner = 0 +6:3/0/terrains_peering_bit/bottom_side = 0 +6:3/0/terrains_peering_bit/top_side = 0 +6:3/0/terrains_peering_bit/top_right_corner = 0 7:3/0 = 0 +7:3/0/terrain_set = 0 +7:3/0/terrain = 0 7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:3/0/physics_layer_0/angular_velocity = 0.0 7:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +7:3/0/terrains_peering_bit/bottom_side = 0 +7:3/0/terrains_peering_bit/bottom_left_corner = 0 +7:3/0/terrains_peering_bit/left_side = 0 +7:3/0/terrains_peering_bit/top_left_corner = 0 +7:3/0/terrains_peering_bit/top_side = 0 9:3/0 = 0 +9:3/0/terrain_set = 0 +9:3/0/terrain = 0 9:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:3/0/physics_layer_0/angular_velocity = 0.0 9:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +9:3/0/terrains_peering_bit/right_side = 0 +9:3/0/terrains_peering_bit/bottom_right_corner = 0 +9:3/0/terrains_peering_bit/bottom_side = 0 +9:3/0/terrains_peering_bit/bottom_left_corner = 0 +9:3/0/terrains_peering_bit/left_side = 0 10:3/0 = 0 +10:3/0/terrain_set = 0 +10:3/0/terrain = 0 10:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:3/0/physics_layer_0/angular_velocity = 0.0 10:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +10:3/0/terrains_peering_bit/right_side = 0 +10:3/0/terrains_peering_bit/bottom_right_corner = 0 +10:3/0/terrains_peering_bit/bottom_side = 0 +10:3/0/terrains_peering_bit/bottom_left_corner = 0 +10:3/0/terrains_peering_bit/left_side = 0 12:3/0 = 0 +12:3/0/terrain_set = 0 +12:3/0/terrain = 0 12:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:3/0/physics_layer_0/angular_velocity = 0.0 12:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +12:3/0/terrains_peering_bit/right_side = 0 +12:3/0/terrains_peering_bit/bottom_side = 0 +12:3/0/terrains_peering_bit/top_side = 0 13:3/0 = 0 +13:3/0/terrain_set = 0 +13:3/0/terrain = 0 13:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:3/0/physics_layer_0/angular_velocity = 0.0 13:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +13:3/0/terrains_peering_bit/right_side = 0 +13:3/0/terrains_peering_bit/bottom_side = 0 +13:3/0/terrains_peering_bit/left_side = 0 15:3/0 = 0 +15:3/0/terrain_set = 0 +15:3/0/terrain = 0 15:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:3/0/physics_layer_0/angular_velocity = 0.0 15:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +15:3/0/terrains_peering_bit/right_side = 0 +15:3/0/terrains_peering_bit/bottom_side = 0 16:3/0 = 0 +16:3/0/terrain_set = 0 +16:3/0/terrain = 0 16:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:3/0/physics_layer_0/angular_velocity = 0.0 16:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +16:3/0/terrains_peering_bit/bottom_side = 0 +16:3/0/terrains_peering_bit/left_side = 0 0:4/0 = 0 0:4/0/terrain_set = 0 0:4/0/terrain = 0 @@ -268,37 +395,83 @@ texture_region_size = Vector2i(32, 32) 4:4/0/physics_layer_0/angular_velocity = 0.0 4:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 6:4/0 = 0 +6:4/0/terrain_set = 0 +6:4/0/terrain = 0 6:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 6:4/0/physics_layer_0/angular_velocity = 0.0 6:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +6:4/0/terrains_peering_bit/right_side = 0 +6:4/0/terrains_peering_bit/bottom_right_corner = 0 +6:4/0/terrains_peering_bit/bottom_side = 0 +6:4/0/terrains_peering_bit/top_side = 0 +6:4/0/terrains_peering_bit/top_right_corner = 0 7:4/0 = 0 +7:4/0/terrain_set = 0 +7:4/0/terrain = 0 7:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 7:4/0/physics_layer_0/angular_velocity = 0.0 7:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +7:4/0/terrains_peering_bit/bottom_side = 0 +7:4/0/terrains_peering_bit/bottom_left_corner = 0 +7:4/0/terrains_peering_bit/left_side = 0 +7:4/0/terrains_peering_bit/top_left_corner = 0 +7:4/0/terrains_peering_bit/top_side = 0 9:4/0 = 0 +9:4/0/terrain_set = 0 +9:4/0/terrain = 0 9:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 9:4/0/physics_layer_0/angular_velocity = 0.0 9:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +9:4/0/terrains_peering_bit/right_side = 0 +9:4/0/terrains_peering_bit/left_side = 0 +9:4/0/terrains_peering_bit/top_left_corner = 0 +9:4/0/terrains_peering_bit/top_side = 0 +9:4/0/terrains_peering_bit/top_right_corner = 0 10:4/0 = 0 +10:4/0/terrain_set = 0 +10:4/0/terrain = 0 10:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 10:4/0/physics_layer_0/angular_velocity = 0.0 10:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +10:4/0/terrains_peering_bit/right_side = 0 +10:4/0/terrains_peering_bit/left_side = 0 +10:4/0/terrains_peering_bit/top_left_corner = 0 +10:4/0/terrains_peering_bit/top_side = 0 +10:4/0/terrains_peering_bit/top_right_corner = 0 12:4/0 = 0 +12:4/0/terrain_set = 0 +12:4/0/terrain = 0 12:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 12:4/0/physics_layer_0/angular_velocity = 0.0 12:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +12:4/0/terrains_peering_bit/right_side = 0 +12:4/0/terrains_peering_bit/left_side = 0 +12:4/0/terrains_peering_bit/top_side = 0 13:4/0 = 0 +13:4/0/terrain_set = 0 +13:4/0/terrain = 0 13:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 13:4/0/physics_layer_0/angular_velocity = 0.0 13:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +13:4/0/terrains_peering_bit/bottom_side = 0 +13:4/0/terrains_peering_bit/left_side = 0 +13:4/0/terrains_peering_bit/top_side = 0 15:4/0 = 0 +15:4/0/terrain_set = 0 +15:4/0/terrain = 0 15:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 15:4/0/physics_layer_0/angular_velocity = 0.0 15:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +15:4/0/terrains_peering_bit/right_side = 0 +15:4/0/terrains_peering_bit/top_side = 0 16:4/0 = 0 +16:4/0/terrain_set = 0 +16:4/0/terrain = 0 16:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) 16:4/0/physics_layer_0/angular_velocity = 0.0 16:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) +16:4/0/terrains_peering_bit/left_side = 0 +16:4/0/terrains_peering_bit/top_side = 0 [sub_resource type="TileSet" id="TileSet_47g5u"] tile_size = Vector2i(32, 32) @@ -313,13 +486,50 @@ sources/0 = SubResource("TileSetAtlasSource_xg6qs") [sub_resource type="CircleShape2D" id="CircleShape2D_x8qck"] radius = 60.2993 +[sub_resource type="Animation" id="Animation_ueqe3"] +resource_name = "move" +loop_mode = 2 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(472, -21), Vector2(540, -21)] +} + +[sub_resource type="Animation" id="Animation_buq5q"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(472, -21)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_36p5o"] +_data = { +"RESET": SubResource("Animation_buq5q"), +"move": SubResource("Animation_ueqe3") +} + [node name="Game" type="Node2D"] script = ExtResource("1_77wyw") [node name="TileMap" type="TileMap" parent="."] tile_set = SubResource("TileSet_47g5u") format = 2 -layer_0/tile_data = PackedInt32Array(262141, 262144, 2, 262142, 65536, 4, 262143, 65536, 4, 196608, 65536, 4, 196609, 65536, 4, 196610, 131072, 4, 196613, 262144, 4, 196605, 262144, 1, 131069, 262144, 1, 65533, 65536, 4, 65532, 262144, 2, -4, 262144, 0, 65534, 65536, 4, 65535, 131072, 4, 4, 131072, 2, 3, 0, 2, -65533, 0, 0, -65532, 131072, 0) +layer_0/tile_data = PackedInt32Array(262141, 262144, 2, 262142, 65536, 4, 262143, 65536, 4, 196608, 65536, 4, 196609, 65536, 4, 196610, 131072, 4, 196613, 262144, 4, 196605, 262144, 1, 131069, 262144, 1, 65534, 65536, 4, 65535, 131072, 4, 4, 131072, 2, 3, 0, 2, -65533, 0, 0, -65532, 131072, 0, 262151, 262144, 2, 196615, 262144, 0, 262153, 262144, 4, 262156, 131072, 2, 196620, 131072, 0, 196619, 0, 0, 262155, 0, 2, 7, 0, 4, 8, 65536, 4, 9, 65536, 4, 10, 1048576, 4, -65526, 983040, 3, -65525, 65536, 4, -65524, 131072, 4, 65550, 0, 4, 65551, 851968, 3, 65552, 131072, 4, 131087, 262144, 2, 65533, 983040, 3) [node name="level" type="Node2D" parent="."] @@ -337,7 +547,7 @@ PUSH_FORCE = 550 [node name="Camera2D" type="Camera2D" parent="CharacterBody2D"] [node name="AreaTrigger" type="Area2D" parent="."] -position = Vector2(274, 22) +position = Vector2(130, -94) script = ExtResource("2_nfj1w") metadata/_edit_group_ = true @@ -350,5 +560,14 @@ debug_color = Color(0.556863, 0.415686, 0.964706, 0.419608) [node name="crate1" parent="crates" instance=ExtResource("5_u8rgi")] position = Vector2(-22, -30) +[node name="Platform" parent="." instance=ExtResource("6_bcgm6")] +position = Vector2(472, -21) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="Platform"] +libraries = { +"": SubResource("AnimationLibrary_36p5o") +} +autoplay = "move" + [connection signal="areatrigger" from="AreaTrigger" to="." method="_on_area_2d_areatrigger"] [connection signal="body_entered" from="AreaTrigger" to="AreaTrigger" method="_on_body_entered"] diff --git a/week4/updated_project/scenes/platform.tscn b/week4/updated_project/scenes/platform.tscn new file mode 100644 index 0000000..e401d4c --- /dev/null +++ b/week4/updated_project/scenes/platform.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://dvd1p6xue0ub2"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_i20vp"] +size = Vector2(100, 20) + +[node name="Platform" type="AnimatableBody2D"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_i20vp") +one_way_collision = true diff --git a/week4/updated_project/scripts/CharacterBody2D.gd b/week4/updated_project/scripts/CharacterBody2D.gd index 81dc6a4..5d353d7 100644 --- a/week4/updated_project/scripts/CharacterBody2D.gd +++ b/week4/updated_project/scripts/CharacterBody2D.gd @@ -46,7 +46,12 @@ func _physics_process(delta): #put the bullet at the Marker owner.add_child(myBullet) - myBullet.transform = marker_right.global_transform + #facing left or right? + if not faceLeft: + myBullet.transform = marker_right.global_transform + else: + myBullet.transform = marker_left.global_transform + myBullet.setSpeed(-750) # Get the input direction and handle the movement/deceleration. # As good practice, you should replace UI actions with custom gameplay actions. @@ -70,7 +75,6 @@ func _physics_process(delta): move_and_slide() if right_ray.is_colliding(): - print("right ray is colliding") var collider = right_ray.get_collider() #what did we hit? if collider is Node: @@ -82,7 +86,6 @@ func _physics_process(delta): pushRightEnabled = false if left_ray.is_colliding(): - print("left ray is colliding") var collider = left_ray.get_collider() if collider is Node: if collider.is_in_group("boxes"):