diff --git a/graphics_assets/player/Player Hurt/Player Hurt 48x48.png b/graphics_assets/player/Player Hurt/Player Hurt 48x48.png new file mode 100644 index 0000000..57d8783 Binary files /dev/null and b/graphics_assets/player/Player Hurt/Player Hurt 48x48.png differ diff --git a/week4/updated_project/.godot/editor/editor_layout.cfg b/week4/updated_project/.godot/editor/editor_layout.cfg index eae73de..a5ab6c9 100644 --- a/week4/updated_project/.godot/editor/editor_layout.cfg +++ b/week4/updated_project/.godot/editor/editor_layout.cfg @@ -19,8 +19,8 @@ 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/background/Additional Sky.png") -dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/background/") +dock_filesystem_selected_paths=PackedStringArray("res://graphics/Terrain (32x32).png") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://graphics/", "res://graphics/Player Idle/", "res://graphics/background/") dock_bottom=[] dock_closed=[] dock_filesystem_h_split_offset=240 @@ -36,7 +36,7 @@ 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=0 +selected_bottom_panel_item=11 [ScriptEditor] diff --git a/week4/updated_project/.godot/editor/script_editor_cache.cfg b/week4/updated_project/.godot/editor/script_editor_cache.cfg index 7b043f8..a97bd46 100644 --- a/week4/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week4/updated_project/.godot/editor/script_editor_cache.cfg @@ -35,7 +35,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 13, -"scroll_position": 0.0, +"scroll_position": 14.0, "selection": false, "syntax_highlighter": "GDScript" } 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 77b7dda..23690f9 100644 --- a/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg +++ b/week5/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-157.347, -37.9273), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game")]) 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 b3b3605..9b6c34e 100644 --- a/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/week5/updated_project/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-53.4626, -32.546), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game")]) 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 06f70e7..ee350f9 100644 --- a/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week5/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-374.822, -210.115), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game")]) 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 99352e8..000a917 100644 --- a/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg +++ b/week5/updated_project/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-51.75, -30.5), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game")]) diff --git a/week5/updated_project/.godot/editor/filesystem_cache8 b/week5/updated_project/.godot/editor/filesystem_cache8 index 4da2888..c96d19c 100644 --- a/week5/updated_project/.godot/editor/filesystem_cache8 +++ b/week5/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1726506615 +::res://::1727719678 icon.svg::CompressedTexture2D::9114977118871582245::1723471253::1723471253::1::::<><>:: ::res://graphics/::1723498498 coin.png::CompressedTexture2D::7063880403899111552::1723478773::1723478782::1::::<><>:: diff --git a/week5/updated_project/.godot/editor/filesystem_update4 b/week5/updated_project/.godot/editor/filesystem_update4 new file mode 100644 index 0000000..f329047 --- /dev/null +++ b/week5/updated_project/.godot/editor/filesystem_update4 @@ -0,0 +1,5 @@ +res://scenes/game.tscn +res://scenes/character.tscn +res://scenes/bullet.tscn +res://scenes/crate.tscn +res://scenes/badguy.tscn 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 61d1ae6..5046532 100644 --- a/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week5/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-211.33, -217.599), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Game")]) diff --git a/week5/updated_project/.godot/editor/project_metadata.cfg b/week5/updated_project/.godot/editor/project_metadata.cfg index 1381b52..8164654 100644 --- a/week5/updated_project/.godot/editor/project_metadata.cfg +++ b/week5/updated_project/.godot/editor/project_metadata.cfg @@ -42,7 +42,7 @@ CenterContainer:scale=true [dialog_bounds] create_new_node=Rect2(354, 283, 900, 700) -project_settings=Rect2(510, 190, 900, 700) +project_settings=Rect2(2372, 237, 900, 700) [color_picker] diff --git a/week5/updated_project/.godot/scene_groups_cache.cfg b/week5/updated_project/.godot/scene_groups_cache.cfg index 547801e..e509e2d 100644 --- a/week5/updated_project/.godot/scene_groups_cache.cfg +++ b/week5/updated_project/.godot/scene_groups_cache.cfg @@ -1,7 +1,7 @@ -[res://scenes/crate.tscn] - -groups=[&"boxes"] - [res://scenes/game.tscn] groups=[&"player"] + +[res://scenes/crate.tscn] + +groups=[&"boxes"] diff --git a/week5/updated_project/scenes/game.tscn b/week5/updated_project/scenes/game.tscn index 7ded00b..9215038 100644 --- a/week5/updated_project/scenes/game.tscn +++ b/week5/updated_project/scenes/game.tscn @@ -18,8 +18,6 @@ texture_region_size = Vector2i(32, 32) 0:0/0 = 0 0:0/0/terrain_set = 0 0:0/0/terrain = 0 -0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:0/0/physics_layer_0/angular_velocity = 0.0 0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:0/0/terrains_peering_bit/right_side = 0 0:0/0/terrains_peering_bit/bottom_right_corner = 0 @@ -27,8 +25,6 @@ texture_region_size = Vector2i(32, 32) 1:0/0 = 0 1:0/0/terrain_set = 0 1:0/0/terrain = 0 -1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:0/0/physics_layer_0/angular_velocity = 0.0 1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:0/0/terrains_peering_bit/right_side = 0 1:0/0/terrains_peering_bit/bottom_right_corner = 0 @@ -38,8 +34,6 @@ texture_region_size = Vector2i(32, 32) 2:0/0 = 0 2:0/0/terrain_set = 0 2:0/0/terrain = 0 -2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:0/0/physics_layer_0/angular_velocity = 0.0 2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:0/0/terrains_peering_bit/bottom_side = 0 2:0/0/terrains_peering_bit/bottom_left_corner = 0 @@ -47,15 +41,11 @@ texture_region_size = Vector2i(32, 32) 4:0/0 = 0 4:0/0/terrain_set = 0 4:0/0/terrain = 0 -4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:0/0/physics_layer_0/angular_velocity = 0.0 4:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 4:0/0/terrains_peering_bit/bottom_side = 0 6:0/0 = 0 6:0/0/terrain_set = 0 6:0/0/terrain = 0 -6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -6:0/0/physics_layer_0/angular_velocity = 0.0 6:0/0/terrains_peering_bit/right_side = 0 6:0/0/terrains_peering_bit/bottom_side = 0 6:0/0/terrains_peering_bit/bottom_left_corner = 0 @@ -66,8 +56,6 @@ texture_region_size = Vector2i(32, 32) 7:0/0 = 0 7:0/0/terrain_set = 0 7:0/0/terrain = 0 -7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -7:0/0/physics_layer_0/angular_velocity = 0.0 7:0/0/terrains_peering_bit/right_side = 0 7:0/0/terrains_peering_bit/bottom_right_corner = 0 7:0/0/terrains_peering_bit/bottom_side = 0 @@ -78,8 +66,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -89,8 +75,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -100,8 +84,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -110,8 +92,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -120,8 +100,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -129,8 +107,6 @@ texture_region_size = Vector2i(32, 32) 0:1/0 = 0 0:1/0/terrain_set = 0 0:1/0/terrain = 0 -0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:1/0/physics_layer_0/angular_velocity = 0.0 0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:1/0/terrains_peering_bit/right_side = 0 0:1/0/terrains_peering_bit/bottom_right_corner = 0 @@ -140,8 +116,6 @@ texture_region_size = Vector2i(32, 32) 1:1/0 = 0 1:1/0/terrain_set = 0 1:1/0/terrain = 0 -1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:1/0/physics_layer_0/angular_velocity = 0.0 1:1/0/terrains_peering_bit/right_side = 0 1:1/0/terrains_peering_bit/bottom_right_corner = 0 1:1/0/terrains_peering_bit/bottom_side = 0 @@ -153,8 +127,6 @@ texture_region_size = Vector2i(32, 32) 2:1/0 = 0 2:1/0/terrain_set = 0 2:1/0/terrain = 0 -2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:1/0/physics_layer_0/angular_velocity = 0.0 2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:1/0/terrains_peering_bit/bottom_side = 0 2:1/0/terrains_peering_bit/bottom_left_corner = 0 @@ -164,16 +136,12 @@ texture_region_size = Vector2i(32, 32) 4:1/0 = 0 4:1/0/terrain_set = 0 4:1/0/terrain = 0 -4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:1/0/physics_layer_0/angular_velocity = 0.0 4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 4:1/0/terrains_peering_bit/bottom_side = 0 4:1/0/terrains_peering_bit/top_side = 0 6:1/0 = 0 6:1/0/terrain_set = 0 6:1/0/terrain = 0 -6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -6:1/0/physics_layer_0/angular_velocity = 0.0 6:1/0/terrains_peering_bit/right_side = 0 6:1/0/terrains_peering_bit/bottom_right_corner = 0 6:1/0/terrains_peering_bit/bottom_side = 0 @@ -182,13 +150,9 @@ texture_region_size = Vector2i(32, 32) 6:1/0/terrains_peering_bit/top_left_corner = 0 6:1/0/terrains_peering_bit/top_side = 0 7:1/0 = 0 -7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -7:1/0/physics_layer_0/angular_velocity = 0.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 @@ -198,8 +162,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -209,8 +171,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -219,8 +179,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -229,8 +187,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -240,8 +196,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -251,8 +205,6 @@ texture_region_size = Vector2i(32, 32) 0:2/0 = 0 0:2/0/terrain_set = 0 0:2/0/terrain = 0 -0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:2/0/physics_layer_0/angular_velocity = 0.0 0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:2/0/terrains_peering_bit/right_side = 0 0:2/0/terrains_peering_bit/top_side = 0 @@ -260,8 +212,6 @@ texture_region_size = Vector2i(32, 32) 1:2/0 = 0 1:2/0/terrain_set = 0 1:2/0/terrain = 0 -1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:2/0/physics_layer_0/angular_velocity = 0.0 1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:2/0/terrains_peering_bit/right_side = 0 1:2/0/terrains_peering_bit/left_side = 0 @@ -271,8 +221,6 @@ texture_region_size = Vector2i(32, 32) 2:2/0 = 0 2:2/0/terrain_set = 0 2:2/0/terrain = 0 -2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:2/0/physics_layer_0/angular_velocity = 0.0 2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:2/0/terrains_peering_bit/left_side = 0 2:2/0/terrains_peering_bit/top_left_corner = 0 @@ -280,15 +228,11 @@ texture_region_size = Vector2i(32, 32) 4:2/0 = 0 4:2/0/terrain_set = 0 4:2/0/terrain = 0 -4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:2/0/physics_layer_0/angular_velocity = 0.0 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 @@ -298,8 +242,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -309,8 +251,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -320,8 +260,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -331,8 +269,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -340,8 +276,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -349,52 +283,38 @@ texture_region_size = Vector2i(32, 32) 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 -0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:4/0/physics_layer_0/angular_velocity = 0.0 0:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:4/0/terrains_peering_bit/right_side = 0 1:4/0 = 0 1:4/0/terrain_set = 0 1:4/0/terrain = 0 -1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:4/0/physics_layer_0/angular_velocity = 0.0 1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:4/0/terrains_peering_bit/right_side = 0 1:4/0/terrains_peering_bit/left_side = 0 2:4/0 = 0 2:4/0/terrain_set = 0 2:4/0/terrain = 0 -2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:4/0/physics_layer_0/angular_velocity = 0.0 2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:4/0/terrains_peering_bit/left_side = 0 4:4/0 = 0 4:4/0/terrain_set = 0 4:4/0/terrain = 0 -4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -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 @@ -404,8 +324,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -415,8 +333,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -426,8 +342,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -437,8 +351,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -446,8 +358,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -455,16 +365,12 @@ texture_region_size = Vector2i(32, 32) 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 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 1f6f202..5550bc4 100644 --- a/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg +++ b/week6/updated_project/.godot/editor/badguy.tscn-editstate-e196a632ea77e9a0d8baa608f164a4d2.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-157.347, -37.9273), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,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/Control/VBoxContainer/HBoxContainer/MarginContainer2/Health")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Area2D")]) diff --git a/week6/updated_project/.godot/editor/badguy.tscn-folding-e196a632ea77e9a0d8baa608f164a4d2.cfg b/week6/updated_project/.godot/editor/badguy.tscn-folding-e196a632ea77e9a0d8baa608f164a4d2.cfg index 9a46423..4bc305a 100644 --- a/week6/updated_project/.godot/editor/badguy.tscn-folding-e196a632ea77e9a0d8baa608f164a4d2.cfg +++ b/week6/updated_project/.godot/editor/badguy.tscn-folding-e196a632ea77e9a0d8baa608f164a4d2.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("AnimatedSprite2D"), PackedStringArray("Animation", "sprite_frames")] +node_unfolds=[NodePath("AnimatedSprite2D"), PackedStringArray("Animation", "sprite_frames", "Texture")] resource_unfolds=["res://scenes/badguy.tscn::SpriteFrames_oohu0", PackedStringArray(), "res://scenes/badguy.tscn::RectangleShape2D_jipcy", PackedStringArray()] nodes_folded=[] 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 9cb6a77..1c36c75 100644 --- a/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week6/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-374.822, -210.115), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,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/Control/VBoxContainer/HBoxContainer/MarginContainer2/Health")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Area2D")]) 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 fbf26fa..176edb0 100644 --- a/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg +++ b/week6/updated_project/.godot/editor/coin.tscn-editstate-96b2131180b71dd158e52c5527d22dd4.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-60.3277, -29.0127), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,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/Control/VBoxContainer/HBoxContainer/MarginContainer2/Health")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Area2D")]) diff --git a/week6/updated_project/.godot/editor/editor_layout.cfg b/week6/updated_project/.godot/editor/editor_layout.cfg index 0c3e654..0a3ca4a 100644 --- a/week6/updated_project/.godot/editor/editor_layout.cfg +++ b/week6/updated_project/.godot/editor/editor_layout.cfg @@ -32,7 +32,7 @@ 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", "res://scenes/ui.tscn") -current_scene="res://scenes/game.tscn" +current_scene="res://scenes/ui.tscn" center_split_offset=-252 selected_default_debugger_tab_idx=0 selected_main_editor_idx=2 @@ -41,7 +41,7 @@ selected_bottom_panel_item=0 [ScriptEditor] open_scripts=["res://scripts/badguy.gd", "res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/resources/character_stats.gd", "res://scripts/coin.gd", "res://scripts/gamecontroller.gd", "res://scripts/gameManager/gamemanager.gd", "res://scripts/Trigger.gd", "res://scripts/ui.gd"] -selected_script="res://scripts/gamecontroller.gd" +selected_script="res://scripts/ui.gd" open_help=[] script_split_offset=70 list_split_offset=0 diff --git a/week6/updated_project/.godot/editor/filesystem_cache8 b/week6/updated_project/.godot/editor/filesystem_cache8 index cc318cb..db012dd 100644 --- a/week6/updated_project/.godot/editor/filesystem_cache8 +++ b/week6/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1726507883 +::res://::1728304631 icon.svg::CompressedTexture2D::9114977118871582245::1724024726::1724024726::1::::<><>:: ::res://graphics/::1724092705 coin.png::CompressedTexture2D::7063880403899111552::1724024726::1724024726::1::::<><>:: @@ -26,17 +26,17 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1724024726::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1724024726::1724024726::1::::<><>:: ::res://graphics/Player Run/::1724024726 player run 48x48.png::CompressedTexture2D::1502492849971408816::1724024726::1724024726::1::::<><>:: -::res://scenes/::1724627940 +::res://scenes/::1727982966 area_trigger.tscn::PackedScene::2953141911562060689::1724024726::0::1::::<><>::res://scripts/Trigger.gd -badguy.tscn::PackedScene::8923528729538756339::1724627221::0::1::::<><>::res://scripts/badguy.gd<>uid://c4g3ypigewuuu::::res://graphics/slime_green.png +badguy.tscn::PackedScene::8923528729538756339::1727982966::0::1::::<><>::res://scripts/badguy.gd<>uid://c4g3ypigewuuu::::res://graphics/slime_green.png bullet.tscn::PackedScene::6880909734590904373::1724035820::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1724627221::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://dytvp6158kit2::::res://graphics/Player Hurt/Player Hurt 48x48.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::1724627221::0::1::::<><>::uid://c7v2cwn2826lg::::res://graphics/coin.png<>res://scripts/coin.gd +character.tscn::PackedScene::451838158579532324::1727982966::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://dytvp6158kit2::::res://graphics/Player Hurt/Player Hurt 48x48.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::1727982966::0::1::::<><>::uid://c7v2cwn2826lg::::res://graphics/coin.png<>res://scripts/coin.gd crate.tscn::PackedScene::41931541512830250::1724035820::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1724627221::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://w7al4r6vnaye::::res://scenes/ui.tscn<>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 +game.tscn::PackedScene::1738196330916037717::1727982966::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://w7al4r6vnaye::::res://scenes/ui.tscn<>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::1724024726::0::1::::<><>:: platform.tscn::PackedScene::8641027994130079701::1724024726::0::1::::<><>:: -ui.tscn::PackedScene::1610235842775481356::1724627940::0::1::::<><>::res://scripts/ui.gd<>uid://dt362md65hx83::::res://graphics/fonts/PixelOperator8.ttf +ui.tscn::PackedScene::1610235842775481356::1727982966::0::1::::<><>::res://scripts/ui.gd<>uid://dt362md65hx83::::res://graphics/fonts/PixelOperator8.ttf ::res://scripts/::1724627940 badguy.gd::GDScript::-1::1724094849::0::1::::Enemy<>Area2D<>:: bullet.gd::GDScript::-1::1724024726::0::1::::<>Area2D<>:: @@ -45,9 +45,9 @@ coin.gd::GDScript::-1::1724094199::0::1::::Coin<>Area2D<>:: gamecontroller.gd::GDScript::-1::1724095485::0::1::::<>Node<>:: Trigger.gd::GDScript::-1::1724024726::0::1::::<>Area2D<>:: ui.gd::GDScript::-1::1724627940::0::1::::<>Control<>:: -::res://scripts/gameManager/::1724073623 -gamemanager.gd::GDScript::-1::1724073623::0::1::::<>Node<>:: -::res://scripts/resources/::1724073389 -character_stats.gd::GDScript::-1::1724028944::0::1::::CharacterStats<>Resource<>:: -player_stats.tres::Resource/Resource::3561309685261247282::1724072114::0::1::::<><>::res://scripts/resources/character_stats.gd +::res://scripts/gameManager/::1727725123 +gamemanager.gd::GDScript::-1::1727725123::0::1::::<>Node<>:: +::res://scripts/resources/::1727747463 +character_stats.gd::GDScript::-1::1727725123::0::1::::CharacterStats<>Resource<>:: +player_stats.tres::Resource/CharacterStats::3561309685261247282::1727747463::0::1::::<><>::res://scripts/resources/character_stats.gd slime_stats.tres::Resource/Resource::3009667384297077150::1724073389::0::1::::<><>::res://scripts/resources/character_stats.gd diff --git a/week6/updated_project/.godot/editor/filesystem_update4 b/week6/updated_project/.godot/editor/filesystem_update4 new file mode 100644 index 0000000..b61c93d --- /dev/null +++ b/week6/updated_project/.godot/editor/filesystem_update4 @@ -0,0 +1,5 @@ +res://scenes/game.tscn +res://scenes/character.tscn +res://scenes/badguy.tscn +res://scenes/coin.tscn +res://scenes/ui.tscn 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 09d6370..9ccf538 100644 --- a/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week6/updated_project/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-113.815, -186.817), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,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/Control/VBoxContainer/HBoxContainer/MarginContainer2/Health")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Area2D")]) 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 89c1fa9..d189a5e 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("BoxTrapTrigger"), NodePath("MovingPlatform"), NodePath("UICanvas")] +nodes_folded=[NodePath("SceneManager"), NodePath("ParallaxBackground"), NodePath("ParallaxBackground/ParallaxLayer"), NodePath("Ground"), NodePath("CharacterBody2D"), NodePath("crates"), NodePath("coins"), NodePath("enemies"), NodePath("BoxTrapTrigger"), NodePath("MovingPlatform")] diff --git a/week6/updated_project/.godot/editor/project_metadata.cfg b/week6/updated_project/.godot/editor/project_metadata.cfg index 1ec33af..69bf1fc 100644 --- a/week6/updated_project/.godot/editor/project_metadata.cfg +++ b/week6/updated_project/.godot/editor/project_metadata.cfg @@ -49,7 +49,7 @@ MarginContainer:scale=true [dialog_bounds] create_new_node=Rect2(354, 283, 900, 700) -project_settings=Rect2(510, 190, 900, 700) +project_settings=Rect2(2396, 204, 900, 700) [color_picker] diff --git a/week6/updated_project/.godot/editor/script_editor_cache.cfg b/week6/updated_project/.godot/editor/script_editor_cache.cfg index ce85427..fac6116 100644 --- a/week6/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week6/updated_project/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 34, +"column": 44, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 14, -"scroll_position": 0.0, +"row": 57, +"scroll_position": 40.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 15, +"column": 26, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 32, -"scroll_position": 119.0, +"row": 126, +"scroll_position": 114.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -73,11 +73,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 17, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 12, -"scroll_position": 0.0, +"row": 17, +"scroll_position": 13.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -90,7 +90,7 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 7, +"row": 6, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -115,10 +115,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 33, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 9, +"row": 8, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/week6/updated_project/.godot/editor/ui.tscn-editstate-9211dc52ac9df169ba4fe77cbc1dc833.cfg b/week6/updated_project/.godot/editor/ui.tscn-editstate-9211dc52ac9df169ba4fe77cbc1dc833.cfg index 0eeaf96..d85ab64 100644 --- a/week6/updated_project/.godot/editor/ui.tscn-editstate-9211dc52ac9df169ba4fe77cbc1dc833.cfg +++ b/week6/updated_project/.godot/editor/ui.tscn-editstate-9211dc52ac9df169ba4fe77cbc1dc833.cfg @@ -10,10 +10,12 @@ Anim={ "grid_visibility": 1, "ofs": Vector2(-165, -110), "primary_grid_step": Vector2i(8, 8), -"show_edit_locks": true, +"show_group_gizmos": true, "show_guides": true, "show_helpers": false, +"show_lock_gizmos": true, "show_origin": true, +"show_position_gizmos": true, "show_rulers": true, "show_transformation_gizmos": true, "show_viewport": true, @@ -54,6 +56,7 @@ Anim={ "LightmapGI": 0, "LightmapProbe": 0, "Marker3D": 0, +"MeshInstance3DCustomAABB": 0, "NavigationLink3D": 0, "NavigationRegion3D": 0, "OccluderInstance3D": 0, @@ -96,7 +99,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -115,7 +118,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -134,7 +137,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -153,7 +156,7 @@ Anim={ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, -"display_mode": 20, +"display_mode": 21, "distance": 4.0, "doppler": false, "frame_time": false, @@ -172,4 +175,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/Control/VBoxContainer/HBoxContainer/MarginContainer2/Health")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16886/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/Area2D")]) diff --git a/week6/updated_project/scenes/badguy.tscn b/week6/updated_project/scenes/badguy.tscn index a2c1ca4..e2dd09a 100644 --- a/week6/updated_project/scenes/badguy.tscn +++ b/week6/updated_project/scenes/badguy.tscn @@ -46,6 +46,7 @@ size = Vector2(17, 15) script = ExtResource("1_ees8e") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +texture_filter = 1 sprite_frames = SubResource("SpriteFrames_oohu0") autoplay = "default" diff --git a/week6/updated_project/scenes/game.tscn b/week6/updated_project/scenes/game.tscn index 3e72e9b..e0c284d 100644 --- a/week6/updated_project/scenes/game.tscn +++ b/week6/updated_project/scenes/game.tscn @@ -19,8 +19,6 @@ texture_region_size = Vector2i(32, 32) 0:0/0 = 0 0:0/0/terrain_set = 0 0:0/0/terrain = 0 -0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:0/0/physics_layer_0/angular_velocity = 0.0 0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:0/0/terrains_peering_bit/right_side = 0 0:0/0/terrains_peering_bit/bottom_right_corner = 0 @@ -28,8 +26,6 @@ texture_region_size = Vector2i(32, 32) 1:0/0 = 0 1:0/0/terrain_set = 0 1:0/0/terrain = 0 -1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:0/0/physics_layer_0/angular_velocity = 0.0 1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:0/0/terrains_peering_bit/right_side = 0 1:0/0/terrains_peering_bit/bottom_right_corner = 0 @@ -39,8 +35,6 @@ texture_region_size = Vector2i(32, 32) 2:0/0 = 0 2:0/0/terrain_set = 0 2:0/0/terrain = 0 -2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:0/0/physics_layer_0/angular_velocity = 0.0 2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:0/0/terrains_peering_bit/bottom_side = 0 2:0/0/terrains_peering_bit/bottom_left_corner = 0 @@ -48,15 +42,11 @@ texture_region_size = Vector2i(32, 32) 4:0/0 = 0 4:0/0/terrain_set = 0 4:0/0/terrain = 0 -4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:0/0/physics_layer_0/angular_velocity = 0.0 4:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 4:0/0/terrains_peering_bit/bottom_side = 0 6:0/0 = 0 6:0/0/terrain_set = 0 6:0/0/terrain = 0 -6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -6:0/0/physics_layer_0/angular_velocity = 0.0 6:0/0/terrains_peering_bit/right_side = 0 6:0/0/terrains_peering_bit/bottom_side = 0 6:0/0/terrains_peering_bit/bottom_left_corner = 0 @@ -67,8 +57,6 @@ texture_region_size = Vector2i(32, 32) 7:0/0 = 0 7:0/0/terrain_set = 0 7:0/0/terrain = 0 -7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) -7:0/0/physics_layer_0/angular_velocity = 0.0 7:0/0/terrains_peering_bit/right_side = 0 7:0/0/terrains_peering_bit/bottom_right_corner = 0 7:0/0/terrains_peering_bit/bottom_side = 0 @@ -79,8 +67,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -90,8 +76,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -101,8 +85,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -111,8 +93,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -121,8 +101,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -130,8 +108,6 @@ texture_region_size = Vector2i(32, 32) 0:1/0 = 0 0:1/0/terrain_set = 0 0:1/0/terrain = 0 -0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:1/0/physics_layer_0/angular_velocity = 0.0 0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:1/0/terrains_peering_bit/right_side = 0 0:1/0/terrains_peering_bit/bottom_right_corner = 0 @@ -141,8 +117,6 @@ texture_region_size = Vector2i(32, 32) 1:1/0 = 0 1:1/0/terrain_set = 0 1:1/0/terrain = 0 -1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:1/0/physics_layer_0/angular_velocity = 0.0 1:1/0/terrains_peering_bit/right_side = 0 1:1/0/terrains_peering_bit/bottom_right_corner = 0 1:1/0/terrains_peering_bit/bottom_side = 0 @@ -154,8 +128,6 @@ texture_region_size = Vector2i(32, 32) 2:1/0 = 0 2:1/0/terrain_set = 0 2:1/0/terrain = 0 -2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:1/0/physics_layer_0/angular_velocity = 0.0 2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:1/0/terrains_peering_bit/bottom_side = 0 2:1/0/terrains_peering_bit/bottom_left_corner = 0 @@ -165,16 +137,12 @@ texture_region_size = Vector2i(32, 32) 4:1/0 = 0 4:1/0/terrain_set = 0 4:1/0/terrain = 0 -4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:1/0/physics_layer_0/angular_velocity = 0.0 4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 4:1/0/terrains_peering_bit/bottom_side = 0 4:1/0/terrains_peering_bit/top_side = 0 6:1/0 = 0 6:1/0/terrain_set = 0 6:1/0/terrain = 0 -6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -6:1/0/physics_layer_0/angular_velocity = 0.0 6:1/0/terrains_peering_bit/right_side = 0 6:1/0/terrains_peering_bit/bottom_right_corner = 0 6:1/0/terrains_peering_bit/bottom_side = 0 @@ -183,13 +151,9 @@ texture_region_size = Vector2i(32, 32) 6:1/0/terrains_peering_bit/top_left_corner = 0 6:1/0/terrains_peering_bit/top_side = 0 7:1/0 = 0 -7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) -7:1/0/physics_layer_0/angular_velocity = 0.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 @@ -199,8 +163,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -210,8 +172,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -220,8 +180,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -230,8 +188,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -241,8 +197,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -252,8 +206,6 @@ texture_region_size = Vector2i(32, 32) 0:2/0 = 0 0:2/0/terrain_set = 0 0:2/0/terrain = 0 -0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:2/0/physics_layer_0/angular_velocity = 0.0 0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:2/0/terrains_peering_bit/right_side = 0 0:2/0/terrains_peering_bit/top_side = 0 @@ -261,8 +213,6 @@ texture_region_size = Vector2i(32, 32) 1:2/0 = 0 1:2/0/terrain_set = 0 1:2/0/terrain = 0 -1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:2/0/physics_layer_0/angular_velocity = 0.0 1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:2/0/terrains_peering_bit/right_side = 0 1:2/0/terrains_peering_bit/left_side = 0 @@ -272,8 +222,6 @@ texture_region_size = Vector2i(32, 32) 2:2/0 = 0 2:2/0/terrain_set = 0 2:2/0/terrain = 0 -2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:2/0/physics_layer_0/angular_velocity = 0.0 2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:2/0/terrains_peering_bit/left_side = 0 2:2/0/terrains_peering_bit/top_left_corner = 0 @@ -281,15 +229,11 @@ texture_region_size = Vector2i(32, 32) 4:2/0 = 0 4:2/0/terrain_set = 0 4:2/0/terrain = 0 -4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0) -4:2/0/physics_layer_0/angular_velocity = 0.0 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 @@ -299,8 +243,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -310,8 +252,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -321,8 +261,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -332,8 +270,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -341,8 +277,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -350,52 +284,38 @@ texture_region_size = Vector2i(32, 32) 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 -0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -0:4/0/physics_layer_0/angular_velocity = 0.0 0:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 0:4/0/terrains_peering_bit/right_side = 0 1:4/0 = 0 1:4/0/terrain_set = 0 1:4/0/terrain = 0 -1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -1:4/0/physics_layer_0/angular_velocity = 0.0 1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 1:4/0/terrains_peering_bit/right_side = 0 1:4/0/terrains_peering_bit/left_side = 0 2:4/0 = 0 2:4/0/terrain_set = 0 2:4/0/terrain = 0 -2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -2:4/0/physics_layer_0/angular_velocity = 0.0 2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16) 2:4/0/terrains_peering_bit/left_side = 0 4:4/0 = 0 4:4/0/terrain_set = 0 4:4/0/terrain = 0 -4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0) -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 @@ -405,8 +325,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -416,8 +334,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -427,8 +343,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -438,8 +352,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -447,8 +359,6 @@ texture_region_size = Vector2i(32, 32) 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 @@ -456,16 +366,12 @@ texture_region_size = Vector2i(32, 32) 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 diff --git a/week6/updated_project/scripts/gameManager/gamemanager.gd b/week6/updated_project/scripts/gameManager/gamemanager.gd index 404163b..c806e41 100644 --- a/week6/updated_project/scripts/gameManager/gamemanager.gd +++ b/week6/updated_project/scripts/gameManager/gamemanager.gd @@ -13,4 +13,3 @@ func resetPlayer(): func playerDamage(): #replace this damage amount with value from data object player.health -=20 - diff --git a/week6/updated_project/scripts/resources/character_stats.gd b/week6/updated_project/scripts/resources/character_stats.gd index 85378aa..77e3dce 100644 --- a/week6/updated_project/scripts/resources/character_stats.gd +++ b/week6/updated_project/scripts/resources/character_stats.gd @@ -4,4 +4,3 @@ extends Resource @export var max_health: int = 100 @export var starting_health: int = 100 @export var health: int = 100 -