diff --git a/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index b3b3605..0155402 100644 --- a/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +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/RigidBody2D/Sprite2D")]) diff --git a/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 86add5d..97748ea 100644 --- a/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +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/RigidBody2D/Sprite2D")]) diff --git a/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg b/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg new file mode 100644 index 0000000..3ae7d9f --- /dev/null +++ b/.godot/editor/crate.tscn-editstate-65637dc57c83dac3d15ec1cb22439bd7.cfg @@ -0,0 +1,175 @@ +[editor_states] + +Anim={ +"visible": false +} +2D={ +"grid_offset": Vector2(0, 0), +"grid_snap_active": false, +"grid_step": Vector2(8, 8), +"grid_visibility": 1, +"ofs": Vector2(-60.3456, -38.4657), +"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": 3.5636 +} +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/RigidBody2D/Sprite2D")]) diff --git a/.godot/editor/crate.tscn-folding-65637dc57c83dac3d15ec1cb22439bd7.cfg b/.godot/editor/crate.tscn-folding-65637dc57c83dac3d15ec1cb22439bd7.cfg new file mode 100644 index 0000000..e237cfa --- /dev/null +++ b/.godot/editor/crate.tscn-folding-65637dc57c83dac3d15ec1cb22439bd7.cfg @@ -0,0 +1,5 @@ +[folding] + +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("CollisionShape2D"), PackedStringArray("Transform", "shape")] +resource_unfolds=["res://scenes/crate.tscn::RectangleShape2D_4vo4d", PackedStringArray()] +nodes_folded=[] diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 66d0f70..748576d 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,3 +1,7 @@ +Sprite2D +TileMap +Camera2D +Node AnimatedSprite2D Node2D CollisionShape2D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 7641bc6..3873917 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -19,7 +19,7 @@ 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/Player Idle 48x48.png") +dock_filesystem_selected_paths=PackedStringArray("res://graphics/box.png") dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://graphics/") dock_3="Scene,Import" dock_4="FileSystem" @@ -27,17 +27,17 @@ dock_5="Inspector,Node,History" [EditorNode] -open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn") -current_scene="res://scenes/character.tscn" +open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn", "res://scenes/crate.tscn") +current_scene="res://scenes/crate.tscn" center_split_offset=0 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 -selected_bottom_panel_item=9 +selected_main_editor_idx=0 +selected_bottom_panel_item=0 [ScriptEditor] open_scripts=["res://scripts/bullet.gd", "res://scripts/CharacterBody2D.gd", "res://scripts/gamecontroller.gd"] -selected_script="res://scripts/CharacterBody2D.gd" +selected_script="res://scripts/gamecontroller.gd" open_help=[] script_split_offset=70 list_split_offset=0 diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 2fe8b4f..27ebaf6 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,17 +1,20 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1721688521 +::res://::1721693520 icon.svg::CompressedTexture2D::9114977118871582245::1721682499::1721682499::1::::<><>:: README.md::TextFile::-1::1721686814::0::1::::<><>:: -::res://graphics/::1721690749 +::res://graphics/::1721696329 +box.png::CompressedTexture2D::7676397872091767385::1721696329::1721696369::1::::<><>:: Player Idle 48x48.png::CompressedTexture2D::3034784150585975320::1721688486::1721688521::1::::<><>:: player jump 48x48.png::CompressedTexture2D::5342238035347045068::1721690749::1721690749::1::::<><>:: player run 48x48.png::CompressedTexture2D::3468292145757083245::1721689940::1721689940::1::::<><>:: -::res://scenes/::1721690574 -bullet.tscn::PackedScene::6880909734590904373::1721690574::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1721690574::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://bjicpmau1iy7y::::res://graphics/Player Idle 48x48.png<>uid://bpocjaij352uj::::res://graphics/player run 48x48.png -game.tscn::PackedScene::1738196330916037717::1721690574::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>res://scripts/Trigger.gd -::res://scripts/::1721690574 +Terrain (32x32).png::CompressedTexture2D::4798441986187280786::1721693500::1721693520::1::::<><>:: +::res://scenes/::1721694291 +bullet.tscn::PackedScene::6880909734590904373::1721694291::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1721694291::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://bjicpmau1iy7y::::res://graphics/Player Idle 48x48.png<>uid://bpocjaij352uj::::res://graphics/player run 48x48.png<>uid://cid246g3bgt7a::::res://graphics/player jump 48x48.png +crate.tscn::PackedScene::8472223533045825203::1721694291::0::1::::<><>:: +game.tscn::PackedScene::1738196330916037717::1721694291::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dsyajwb08wdah::::res://scenes/crate.tscn<>res://scripts/Trigger.gd<>uid://camnvybxsc867::::res://graphics/Terrain (32x32).png +::res://scripts/::1721690941 bullet.gd::GDScript::-1::1721682499::0::1::::<>Area2D<>:: -CharacterBody2D.gd::GDScript::-1::1721690574::0::1::::<>CharacterBody2D<>:: +CharacterBody2D.gd::GDScript::-1::1721690941::0::1::::<>CharacterBody2D<>:: gamecontroller.gd::GDScript::-1::1721682499::0::1::::<>Node2D<>:: Trigger.gd::GDScript::-1::1721682499::0::1::::<>Area2D<>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index acb0fcf..ea30d0f 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -2,3 +2,4 @@ res://scenes/game.tscn res://scenes/character.tscn res://scenes/bullet.tscn res://scripts/CharacterBody2D.gd +res://scenes/crate.tscn diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 0cb9104..237137b 100644 --- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-452.67, -210.078), +"ofs": Vector2(-440, -106), "primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.707107 +"zoom": 1.0 } 3D={ "fov": 70.01, @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([]) +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/RigidBody2D/Sprite2D")]) diff --git a/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index 71afb8a..925b54b 100644 --- a/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("StaticBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D2"), PackedStringArray("Transform"), NodePath("groundblock"), PackedStringArray("Transform"), NodePath("groundblock/CollisionShape2D"), PackedStringArray("Transform"), NodePath("groundblock2"), PackedStringArray("Transform"), NodePath("groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock2"), PackedStringArray("Transform"), NodePath("level/groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock3"), PackedStringArray("Transform"), NodePath("level/groundblock3/CollisionShape2D"), PackedStringArray("Transform"), NodePath("Area2D"), PackedStringArray("Transform")] -resource_unfolds=["res://scenes/game.tscn::WorldBoundaryShape2D_3u4a8", PackedStringArray("Resource"), "res://scenes/game.tscn::RectangleShape2D_4vo4d", PackedStringArray("Resource"), "res://scenes/game.tscn::RectangleShape2D_cq7kj", PackedStringArray("Resource"), "res://scenes/game.tscn::CircleShape2D_x8qck", PackedStringArray("Resource")] -nodes_folded=[] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMap"), PackedStringArray("tile_set"), NodePath("level/groundblock2"), PackedStringArray("Transform"), NodePath("level/groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock3"), PackedStringArray("Transform"), NodePath("level/groundblock3/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock4"), PackedStringArray("Transform"), NodePath("level/groundblock4/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock"), PackedStringArray("Transform"), NodePath("level/groundblock/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/StaticBody2D"), PackedStringArray("Transform"), NodePath("CharacterBody2D/Camera2D"), PackedStringArray("Position Smoothing"), NodePath("Area2D"), PackedStringArray("Transform")] +resource_unfolds=["res://scenes/game.tscn::TileSet_asfwo", PackedStringArray(), "res://scenes/game.tscn::RectangleShape2D_cq7kj", PackedStringArray("Resource"), "res://scenes/game.tscn::WorldBoundaryShape2D_3u4a8", PackedStringArray("Resource"), "res://scenes/game.tscn::CircleShape2D_x8qck", PackedStringArray("Resource")] +nodes_folded=[NodePath("CharacterBody2D"), NodePath("Area2D")] diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 664dd4b..39c4556 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -2,16 +2,17 @@ executable_path="/home/timbot/Documents/Software/godot/Godot_v4.2.1-stable_linux.x86_64" use_advanced_connections=false +tile_source_sort=0 [debug_options] run_live_debug=true run_reload_scripts=true -run_debug_collisions=true +run_debug_collisions=false [recent_files] -scenes=["res://scenes/bullet.tscn", "res://scenes/character.tscn", "res://scenes/game.tscn"] +scenes=["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] @@ -24,6 +25,10 @@ RigidBody2D:scale=true RayCast2D:scale=true Area2D:scale=true AnimatedSprite2D:scale=true +Camera2D:zoom=true +Camera2D:scale=true +TileMap:scale=true +Sprite2D:scale=true [dialog_bounds] @@ -37,3 +42,7 @@ recent_presets=PackedColorArray(0.616312, 0.404074, 0.899578, 0.42, 0.720388, 0. [script_setup] last_selected_language="GDScript" + +[project_settings] + +advanced_mode=true diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 6c5985a..21e4d30 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,3 +1,3 @@ +res://scenes res://graphics res://scripts -res://scenes diff --git a/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.ctex b/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.ctex new file mode 100644 index 0000000..e9825e7 Binary files /dev/null and b/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.ctex differ diff --git a/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.md5 b/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.md5 new file mode 100644 index 0000000..2888602 --- /dev/null +++ b/.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.md5 @@ -0,0 +1,3 @@ +source_md5="d795d66ea17df8d684197c8d47ffe0d6" +dest_md5="eb1ab57ee49d2726692bb79f8241f155" + diff --git a/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.ctex b/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.ctex new file mode 100644 index 0000000..e9825e7 Binary files /dev/null and b/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.ctex differ diff --git a/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.md5 b/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.md5 new file mode 100644 index 0000000..2888602 --- /dev/null +++ b/.godot/imported/Terrain (32x32).png-b4babc7a48f3aa6e052707b115e043e3.md5 @@ -0,0 +1,3 @@ +source_md5="d795d66ea17df8d684197c8d47ffe0d6" +dest_md5="eb1ab57ee49d2726692bb79f8241f155" + diff --git a/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.ctex b/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.ctex new file mode 100644 index 0000000..e9825e7 Binary files /dev/null and b/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.ctex differ diff --git a/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.md5 b/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.md5 new file mode 100644 index 0000000..2888602 --- /dev/null +++ b/.godot/imported/Terrain (32x32).png-cff439addaa6d46be2e52579d490525e.md5 @@ -0,0 +1,3 @@ +source_md5="d795d66ea17df8d684197c8d47ffe0d6" +dest_md5="eb1ab57ee49d2726692bb79f8241f155" + diff --git a/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.ctex b/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.ctex new file mode 100644 index 0000000..0ba6cc5 Binary files /dev/null and b/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.ctex differ diff --git a/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.md5 b/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.md5 new file mode 100644 index 0000000..dad716c --- /dev/null +++ b/.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.md5 @@ -0,0 +1,3 @@ +source_md5="ef69391b0e6576deb6f2be260b66bd2d" +dest_md5="989ef69311142f9e34393aaf9a792259" + diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index c345553..cada3c4 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/graphics/Terrain (32x32).png b/graphics/Terrain (32x32).png new file mode 100644 index 0000000..ddf1eaf Binary files /dev/null and b/graphics/Terrain (32x32).png differ diff --git a/graphics/Terrain (32x32).png.import b/graphics/Terrain (32x32).png.import new file mode 100644 index 0000000..6e974a6 --- /dev/null +++ b/graphics/Terrain (32x32).png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://camnvybxsc867" +path="res://.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/Terrain (32x32).png" +dest_files=["res://.godot/imported/Terrain (32x32).png-ad70ba78825a684cda25de60298b49f9.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/graphics/box.png b/graphics/box.png new file mode 100644 index 0000000..71d4d11 Binary files /dev/null and b/graphics/box.png differ diff --git a/graphics/box.png.import b/graphics/box.png.import new file mode 100644 index 0000000..b10173d --- /dev/null +++ b/graphics/box.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dhmrffbk1h6w0" +path="res://.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/box.png" +dest_files=["res://.godot/imported/box.png-7e0b68744f70b50dab4b22d5dd662157.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/project.godot b/project.godot index a0fbc79..11b6d7f 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,14 @@ run/main_scene="res://scenes/game.tscn" config/features=PackedStringArray("4.2", "Forward Plus") config/icon="res://icon.svg" +[display] + +window/size/viewport_width=320 +window/size/viewport_height=180 +window/size/window_width_override=960 +window/size/window_height_override=540 +window/stretch/mode="viewport" + [file_customization] folder_colors={ diff --git a/scenes/crate.tscn b/scenes/crate.tscn new file mode 100644 index 0000000..5140865 --- /dev/null +++ b/scenes/crate.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=3 uid="uid://dsyajwb08wdah"] + +[ext_resource type="Texture2D" uid="uid://dhmrffbk1h6w0" path="res://graphics/box.png" id="1_1e1vp"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_4vo4d"] + +[node name="RigidBody2D" type="RigidBody2D" groups=["boxes"]] +metadata/_edit_group_ = true + +[node name="Sprite2D" type="Sprite2D" parent="."] +scale = Vector2(0.625, 0.625) +texture = ExtResource("1_1e1vp") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_4vo4d") +debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) diff --git a/scenes/game.tscn b/scenes/game.tscn index d981bd4..4af6bf8 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,85 +1,88 @@ -[gd_scene load_steps=8 format=3 uid="uid://y083suj12rld"] +[gd_scene load_steps=11 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="PackedScene" uid="uid://dsyajwb08wdah" path="res://scenes/crate.tscn" id="2_jsgyx"] [ext_resource type="Script" path="res://scripts/Trigger.gd" id="2_nfj1w"] +[ext_resource type="Texture2D" uid="uid://camnvybxsc867" path="res://graphics/Terrain (32x32).png" id="2_tlti7"] -[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_3u4a8"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_vy4cj"] +texture = ExtResource("2_tlti7") +texture_region_size = Vector2i(32, 32) +0:0/0 = 0 +1:0/0 = 0 +2:0/0 = 0 +4:0/0 = 0 +6:0/0 = 0 +7:0/0 = 0 +9:0/0 = 0 +10:0/0 = 0 +12:0/0 = 0 +13:0/0 = 0 +15:0/0 = 0 +0:1/0 = 0 +1:1/0 = 0 +2:1/0 = 0 +4:1/0 = 0 +6:1/0 = 0 +7:1/0 = 0 +9:1/0 = 0 +10:1/0 = 0 +12:1/0 = 0 +13:1/0 = 0 +15:1/0 = 0 +16:1/0 = 0 +0:2/0 = 0 +1:2/0 = 0 +2:2/0 = 0 +4:2/0 = 0 +6:3/0 = 0 +7:3/0 = 0 +9:3/0 = 0 +10:3/0 = 0 +12:3/0 = 0 +13:3/0 = 0 +15:3/0 = 0 +16:3/0 = 0 +0:4/0 = 0 +1:4/0 = 0 +2:4/0 = 0 +4:4/0 = 0 +6:4/0 = 0 +7:4/0 = 0 +9:4/0 = 0 +10:4/0 = 0 +12:4/0 = 0 +13:4/0 = 0 +15:4/0 = 0 +16:4/0 = 0 -[sub_resource type="RectangleShape2D" id="RectangleShape2D_4vo4d"] -size = Vector2(55, 55) +[sub_resource type="TileSet" id="TileSet_asfwo"] +tile_size = Vector2i(32, 32) +sources/0 = SubResource("TileSetAtlasSource_vy4cj") [sub_resource type="RectangleShape2D" id="RectangleShape2D_cq7kj"] size = Vector2(91, 20) +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_3u4a8"] + [sub_resource type="CircleShape2D" id="CircleShape2D_x8qck"] radius = 60.2993 [node name="Game" type="Node2D"] script = ExtResource("1_77wyw") -[node name="StaticBody2D" type="StaticBody2D" parent="."] -position = Vector2(236, 415) -metadata/_edit_group_ = true +[node name="TileMap" type="TileMap" parent="."] +tile_set = SubResource("TileSet_asfwo") +format = 2 +layer_0/tile_data = PackedInt32Array(917501, 65536, 4, 917502, 65536, 4, 917503, 65536, 4, 851968, 65536, 4, 851969, 65536, 4, 851970, 65536, 4, 851971, 65536, 4, 851972, 65536, 4, 851973, 65536, 4, 851974, 65536, 4, 851975, 65536, 4, 720898, 65536, 4, 720899, 65536, 4, 720900, 65536, 4, 655371, 65536, 4, 655372, 65536, 4, 655373, 65536, 4, 589840, 65536, 4, 589841, 65536, 4, 589842, 65536, 4) -[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] -shape = SubResource("WorldBoundaryShape2D_3u4a8") - -[node name="RigidBody2D" type="RigidBody2D" parent="." groups=["boxes"]] -position = Vector2(139, 35) -rotation = 0.740513 -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="RigidBody2D"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="RigidBody2D2" type="RigidBody2D" parent="." groups=["boxes"]] -position = Vector2(409, -6) -rotation = 0.740513 -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D2"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="RigidBody2D2"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="groundblock" type="StaticBody2D" parent="."] -position = Vector2(117, 384) -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="groundblock"] -position = Vector2(-1.5, 0) -shape = SubResource("RectangleShape2D_cq7kj") - -[node name="groundblock2" type="StaticBody2D" parent="."] -position = Vector2(91, 430) -scale = Vector2(3.76, 1) -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="groundblock2"] -position = Vector2(-1.5, 0) -shape = SubResource("RectangleShape2D_cq7kj") +[node name="RigidBody2D" parent="." instance=ExtResource("2_jsgyx")] [node name="level" type="Node2D" parent="."] [node name="groundblock2" type="StaticBody2D" parent="level"] -position = Vector2(548, 315) +position = Vector2(562, 299) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock2"] @@ -87,18 +90,45 @@ position = Vector2(-1.5, 0) shape = SubResource("RectangleShape2D_cq7kj") [node name="groundblock3" type="StaticBody2D" parent="level"] -position = Vector2(404, 353) +position = Vector2(401, 333) metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock3"] position = Vector2(-1.5, 0) shape = SubResource("RectangleShape2D_cq7kj") +[node name="groundblock4" type="StaticBody2D" parent="level"] +position = Vector2(83, 427) +scale = Vector2(3.76, 1) +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock4"] +position = Vector2(-1.5, 0) +shape = SubResource("RectangleShape2D_cq7kj") + +[node name="groundblock" type="StaticBody2D" parent="level"] +position = Vector2(117, 364) +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="level/groundblock"] +position = Vector2(-1.5, 0) +shape = SubResource("RectangleShape2D_cq7kj") + +[node name="StaticBody2D" type="StaticBody2D" parent="level"] +position = Vector2(256, 419) +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="level/StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_3u4a8") + [node name="CharacterBody2D" parent="." groups=["player"] instance=ExtResource("2_64ccm")] PUSH_FORCE = 550 +[node name="Camera2D" type="Camera2D" parent="CharacterBody2D"] +position_smoothing_enabled = true + [node name="Area2D" type="Area2D" parent="."] -position = Vector2(260, 352) +position = Vector2(268, 337) script = ExtResource("2_nfj1w") metadata/_edit_group_ = true @@ -106,5 +136,9 @@ metadata/_edit_group_ = true shape = SubResource("CircleShape2D_x8qck") debug_color = Color(0.556863, 0.415686, 0.964706, 0.419608) +[node name="RigidBody2D2" parent="." instance=ExtResource("2_jsgyx")] +position = Vector2(155, 142) +rotation = -0.883563 + [connection signal="areatrigger" from="Area2D" to="." method="_on_area_2d_areatrigger"] [connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]