diff --git a/.godot/editor/crate.tscn-editstate-a4680594e8a68a77f3fb58b857d74404.cfg b/.godot/editor/crate.tscn-editstate-a4680594e8a68a77f3fb58b857d74404.cfg index eeec80b..437f902 100644 --- a/.godot/editor/crate.tscn-editstate-a4680594e8a68a77f3fb58b857d74404.cfg +++ b/.godot/editor/crate.tscn-editstate-a4680594e8a68a77f3fb58b857d74404.cfg @@ -5,7 +5,7 @@ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-166, -111), +"ofs": Vector2(-72.70663, -63.110703), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -31,7 +31,7 @@ "snap_rotation_step": 0.2617994, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 1.0 +"zoom": 6.1159115 } 3D={ "fov": 70.01, @@ -189,4 +189,4 @@ Anim={ "visible": false } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Crate")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/crate.tscn-folding-a4680594e8a68a77f3fb58b857d74404.cfg b/.godot/editor/crate.tscn-folding-a4680594e8a68a77f3fb58b857d74404.cfg index d86fdf9..74ae604 100644 --- a/.godot/editor/crate.tscn-folding-a4680594e8a68a77f3fb58b857d74404.cfg +++ b/.godot/editor/crate.tscn-folding-a4680594e8a68a77f3fb58b857d74404.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("Offset", "Texture")] resource_unfolds=["res://Scenes/crate.tscn::RectangleShape2D_ebmjs", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index d4af050..c356919 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,4 +1,6 @@ -Fluid2D +TileMapLayer +Camera2D +Sprite2D AnimatedSprite2D CollisionShape2D StaticBody2D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 05b403c..8f24995 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -11,11 +11,11 @@ dock_hsplit_1=0 dock_hsplit_2=280 dock_hsplit_3=-280 dock_hsplit_4=0 +dock_9_selected_tab_idx=0 dock_3="Scene,Import" dock_4="FileSystem,History" dock_5="Inspector,Signals,Groups" dock_9="Output,Debugger,Audio,Animation,Shader Editor,Search Results,AnimationTree,ResourcePreloader,ShaderFile,SpriteFrames,Theme,Polygon,TileSet,TileMap,Replication,GridMap" -dock_9_selected_tab_idx=0 [docks/FileSystem] @@ -24,8 +24,8 @@ v_split_offset=0 display_mode=0 file_sort=0 file_list_display_mode=1 -selected_paths=PackedStringArray("res://") -uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://Scripts/", "res://Scenes/", "res://Matirials/", "res://assets/", "res://assets/graphics/", "res://assets/graphics/player/") +selected_paths=PackedStringArray("res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png") +uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://Scripts/", "res://Scenes/", "res://Matirials/", "res://assets/", "res://assets/graphics/", "res://assets/graphics/player/", "res://assets/graphics/objects/", "res://assets/graphics/environments/", "res://assets/graphics/environments/Mossy Assets/", "res://assets/graphics/environments/Mossy Assets/Mossy Tileset/") [docks/History] @@ -42,10 +42,12 @@ bottom_panel_offsets={ "Debugger": 0, "Output": 0, "Shader Editor": 0, -"SpriteFrames": 0 +"SpriteFrames": 0, +"TileMap": 0, +"TileSet": -494 } selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 +selected_main_editor_idx=0 [EditorWindow] @@ -56,7 +58,7 @@ position=Vector2i(66, 69) [ScriptEditor] open_scripts=["res://Scripts/crate.gd", "res://Scripts/dropplet.gd", "res://Scripts/fluid_container.gd", "res://Scripts/gameController.gd", "res://Scripts/grenade.gd", "res://Scripts/player.gd", "res://Scripts/SceneManager.gd"] -selected_script="res://Scripts/player.gd" +selected_script="res://Scripts/gameController.gd" open_help=[] script_split_offset=200 list_split_offset=0 @@ -64,7 +66,7 @@ zoom_factor=1.0 [GameView] -floating_window_rect=Rect2i(411, 218, 1164, 668) +floating_window_rect=Rect2i(66, 69, 1854, 1011) floating_window_screen=0 [ShaderEditor] diff --git a/.godot/editor/filesystem_cache10 b/.godot/editor/filesystem_cache10 index f86fc2b..937e6bf 100644 --- a/.godot/editor/filesystem_cache10 +++ b/.godot/editor/filesystem_cache10 @@ -1,63 +1,42 @@ 63f7b34db8d8cdea90c76aacccf841ec -::res://::1777942613 -icon.svg::CompressedTexture2D::153749619968236763::1776733978::1777328938::1::::<><><>0<>0<>d721750725bbe7b918a3c8a49bb7d057<>res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex:: -::res://addons/::1777942180 -::res://addons/godot-rapier2d/::1777942182 -circle_mesh.tres::ArrayMesh::7174673425048804142::1777942182::0::1::::<><><>0<>0<><>:: -faucet_2d.gd::GDScript::9216407355742322844::1777942180::0::1::::Faucet2D<>Fluid2D<><>0<>0<><>:: -fluid_2d_circle.gd::GDScript::7694350402687501325::1777942182::0::1::::<>Fluid2D<><>0<>1<><>:: -fluid_2d_rectangle.gd::GDScript::8761051380306542099::1777942180::0::1::::<>Fluid2D<><>0<>1<><>:: -fluid_2d_renderer.gd::GDScript::7070516150211403761::1777942182::0::1::::Fluid2DRenderer<>MultiMeshInstance2D<><>0<>1<><>:: -fluid_2d_shader_renderer.gd::GDScript::1153928655632662277::1777942180::0::1::::Fluid2DShaderRenderer<>CanvasLayer<><>0<>1<><>:: -godot-rapier2d.gdextension::GDExtension::6464857025447911873::1777942180::0::1::::<><><>0<>0<><>:: -logo_square_2d.png::CompressedTexture2D::9002049772566657075::1777942182::1777942182::1::::<><><>0<>0<>b503ebbccf6e6a46955b8200090051e5<>res://.godot/imported/logo_square_2d.png-ee7cb55fd9c4d1815ce7e83cd5401198.ctex:: -plugin.info.cfg::TextFile::-1::1777942182::0::1::::<><><>0<>0<><>:: -Radial2D.svg::CompressedTexture2D::5294797171325615259::1777942182::1777942182::1::::<><><>0<>0<>1bc62197614fc00072e42040575d98c4<>res://.godot/imported/Radial2D.svg-4380d9841bddc115105cff2016be7c6a.ctex:: -THIRDPARTY.txt::TextFile::-1::1777942182::0::1::::<><><>0<>0<><>:: -water_shader.gdshader::Shader::5244640210084459761::1777942180::0::1::::<><><>0<>0<><>:: -water_shader.tres::ShaderMaterial::6495341302912672044::1777942180::0::1::::<><><>0<>0<><>::res://addons/godot-rapier2d/water_shader.gdshader -::res://addons/godot-rapier2d/bin/::1777942182 -::res://addons/godot-rapier2d/bin/libgodot_rapier.ios.arm64.framework/::1777942181 -::res://addons/godot-rapier2d/bin/libgodot_rapier.ios.x86_64.framework/::1777942181 -::res://addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/::1777942181 -::res://addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/_CodeSignature/::1777942181 -::res://addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/Resources/::1777942181 -::res://addons/godot-rapier2d/bin/wasm-nothreads/::1777942182 -::res://addons/godot-rapier2d/custom_nodes/::1777942181 -rapier_animatable_body_2d.gd::GDScript::4254369835340372453::1777942180::0::1::::RapierAnimatableBody2D<>AnimatableBody2D<><>0<>0<><>:: -rapier_area_2d.gd::GDScript::4885387301949914592::1777942180::0::1::::RapierArea2D<>Area2D<><>0<>0<><>:: -rapier_character_body_2d.gd::GDScript::6912453495765292685::1777942180::0::1::::RapierCharacterBody2D<>CharacterBody2D<><>0<>0<><>:: -rapier_damped_spring_joint_2d.gd::GDScript::5853120700233276591::1777942180::0::1::::RapierDampedSpringJoint2D<>DampedSpringJoint2D<><>0<>0<><>:: -rapier_groove_joint_2d.gd::GDScript::2563535862031637009::1777942180::0::1::::RapierGrooveJoint2D<>GrooveJoint2D<><>0<>0<><>:: -rapier_physical_bone_2d.gd::GDScript::6341721350451337327::1777942180::0::1::::RapierPhysicalBone2D<>PhysicalBone2D<><>0<>0<><>:: -rapier_pin_joint_2d.gd::GDScript::3916190429106199850::1777942180::0::1::::RapierPinJoint2D<>PinJoint2D<><>0<>0<><>:: -rapier_rigid_body_2d.gd::GDScript::1431962763040487152::1777942180::0::1::::RapierRigidBody2D<>RigidBody2D<><>0<>0<><>:: -rapier_static_body_2d.gd::GDScript::3827589778013951087::1777942181::0::1::::RapierStaticBody2D<>StaticBody2D<><>0<>0<><>:: -::res://addons/godot-rapier2d/icons/::1777942182 -Fluid2D.svg::CompressedTexture2D::6302457331682152295::1777942182::1777942182::1::::<><><>0<>0<>231d9337dcdbf2f181060f8de7d5904c<>res://.godot/imported/Fluid2D.svg-af3237d9aa7357bf47435150f6228e4b.ctex:: -StateManager2D.svg::CompressedTexture2D::1277279720193679363::1777942182::1777942182::1::::<><><>0<>0<>92267b7a9348dcef3639d0308e65795b<>res://.godot/imported/StateManager2D.svg-1a4e1b526e80995b692903b1eb5c9c70.ctex:: -::res://assets/::1777939487 -::res://assets/graphics/::1777939495 -::res://assets/graphics/player/::1777940887 -::res://assets/graphics/player/idle/::1777939618 -Player Idle 48x48.png::CompressedTexture2D::1120562523273273602::1777939584::1777939618::1::::<><><>0<>0<>1dc11358f54a695dab93c6526d66354b<>res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex:: -::res://assets/graphics/player/Running/::1777940891 -player run 48x48.png::CompressedTexture2D::7155522852733870023::1777940868::1777940891::1::::<><><>0<>0<>9f7a8470fd2c63dde8f34c8bb31e610f<>res://.godot/imported/player run 48x48.png-04a079043a24250d54279fbf1db0711c.ctex:: -::res://Matirials/::1777942550 -FluidPartical.tres::GradientTexture2D::4268421940562196678::1777942550::0::1::::<><><>0<>0<><>:: -::res://Scenes/::1777942579 -crate.tscn::PackedScene::3685778385901542721::1777936334::0::1::::<><><>0<>0<><>::uid://eb5ucqehuof::::res://Scripts/crate.gd -dropplet.tscn::PackedScene::273344889397887302::1777942301::0::1::::<><><>0<>0<><>::uid://w8ctpjxlfoih::::res://Scripts/dropplet.gd -game.tscn::PackedScene::4205340119192705573::1777942579::0::1::::<><><>0<>0<><>::uid://bc25u4w35ibeu::::res://Scripts/gameController.gd<>uid://bsroh4vsjwblh::::res://Scenes/crate.tscn<>uid://b2otvelhtq7en::::res://Scripts/SceneManager.gd<>uid://dmk1mp1hqm62b::::res://Scenes/player.tscn<>uid://4hekg0d8n04f::::res://Scripts/trigger.gd<>uid://ceyxo0mrrrd6d::::res://Scenes/grenade.tscn<>uid://nhqfqpjecvt8::::res://Scripts/fluid_container.gd<>uid://b12wjykuncw11::::res://Matirials/FluidPartical.tres<>uid://d5n7kwhkl4le::::res://Scenes/dropplet.tscn<>uid://bvte4ugmua4n3::::res://Scripts/Fluid.gdshader -grenade.tscn::PackedScene::5104564632401262693::1777935999::0::1::::<><><>0<>0<><>::uid://jrqdl3mm7rly::::res://Scripts/grenade.gd -player.tscn::PackedScene::8023772851970181075::1777941357::0::1::::<><><>0<>0<><>::uid://btmoyp0rwqmxe::::res://Scripts/player.gd<>uid://c87goe3qmmrv0::::res://assets/graphics/player/Running/player run 48x48.png<>uid://p72rbg7thsvi::::res://assets/graphics/player/idle/Player Idle 48x48.png -::res://Scripts/::1777942579 -crate.gd::GDScript::8372856115375017::1777330004::0::1::::Crate<>RigidBody2D<><>0<>0<><>:: -dropplet.gd::GDScript::1612435192803830343::1777942032::0::1::::<>RigidBody2D<><>0<>0<><>:: -Fluid.gdshader::Shader::3899905293721039882::1777942550::0::1::::<><><>0<>0<><>:: -fluid_container.gd::GDScript::927886876386663595::1777940623::0::1::::<>Node2D<><>0<>0<><>:: -gameController.gd::GDScript::2584395354465320640::1777333585::0::1::::GameController<>Node2D<><>0<>0<><>:: -grenade.gd::GDScript::667771465401199890::1777938554::0::1::::Grenade<>RigidBody2D<><>0<>0<><>:: -player.gd::GDScript::3745674970089689346::1777942579::0::1::::Player<>CharacterBody2D<><>0<>0<><>:: -SceneManager.gd::GDScript::4311612102441731429::1777939966::0::1::::SceneManager<>Node2D<><>0<>0<><>:: -trigger.gd::GDScript::2050188189632629851::1776733978::0::1::::Trigger<>Area2D<><>0<>0<><>:: +::res://::1778544698 +icon.svg::CompressedTexture2D::153749619968236763::1778537253::1778537253::1::::<><><>0<>0<>d721750725bbe7b918a3c8a49bb7d057<>res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex:: +::res://assets/::1778537253 +::res://assets/graphics/::1778545389 +::res://assets/graphics/environments/::1778545391 +::res://assets/graphics/environments/Mossy Assets/::1778545367 +::res://assets/graphics/environments/Mossy Assets/Mossy Tileset/::1597698602 +Mossy - BackgroundDecoration.png::CompressedTexture2D::2958709406219477571::1597116734::1778545406::1::::<><><>0<>0<>cfca195def3c6cfa9ef471efbad360ee<>res://.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex:: +Mossy - Decorations&Hazards.png::CompressedTexture2D::5317842390981034997::1597694354::1778545408::1::::<><><>0<>0<>b87ec02680e303e5ca72773e6cc3daf3<>res://.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex:: +Mossy - FloatingPlatforms.png::CompressedTexture2D::7541034866023111867::1597523692::1778545401::1::::<><><>0<>0<>226b44b30b14e18b0d9e157380e9af54<>res://.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex:: +Mossy - Hanging Plants.png::CompressedTexture2D::5130610249834757288::1597694258::1778545404::1::::<><><>0<>0<>4ab61a84b49eecb7e5b003bf8b5b911c<>res://.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex:: +Mossy - MossyHills.png::CompressedTexture2D::1070615604696373075::1597696046::1778545407::1::::<><><>0<>0<>6ad0a52422b00a3ef2b93d2cbfa3f248<>res://.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex:: +Mossy - TileSet.png::CompressedTexture2D::1591353325382278376::1597344580::1778545412::1::::<><><>0<>0<>b458fbe8eb680b19f0ca41dd8e35020d<>res://.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex:: +::res://assets/graphics/objects/::1778542699 +Crate.png::CompressedTexture2D::4126237878925369283::1778541790::1778541797::1::::<><><>0<>0<>a328a4bf8dfc918d4b90b23ce74e2855<>res://.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex:: +grenade.png::CompressedTexture2D::6392169633909059787::1778542698::1778542699::1::::<><><>0<>0<>7fd4e1e3e2e72b039047605865718c3f<>res://.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex:: +::res://assets/graphics/player/::1778537997 +::res://assets/graphics/player/idle/::1778543901 +Player Idle 48x48.png::CompressedTexture2D::1120562523273273602::1778543900::1778543901::1::::<><><>0<>0<>1dc11358f54a695dab93c6526d66354b<>res://.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex:: +::res://assets/graphics/player/jump_fall/::1778538103 +player jump 48x48.png::CompressedTexture2D::4549613102573080607::1778538102::1778538103::1::::<><><>0<>0<>3af3873687ce62ebdaeb0453da93f1e1<>res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex:: +::res://assets/graphics/player/Running/::1778537253 +player run 48x48.png::CompressedTexture2D::7155522852733870023::1778537253::1778537253::1::::<><><>0<>0<>9f7a8470fd2c63dde8f34c8bb31e610f<>res://.godot/imported/player run 48x48.png-04a079043a24250d54279fbf1db0711c.ctex:: +::res://Matirials/::1778537830 +FluidPartical.tres::GradientTexture2D::4268421940562196678::1778537830::0::1::::<><><>0<>0<><>:: +::res://Scenes/::1778544876 +crate.tscn::PackedScene::3685778385901542721::1778541873::0::1::::<><><>0<>0<><>::uid://eb5ucqehuof::::res://Scripts/crate.gd<>uid://by11sgqh2p1n0::::res://assets/graphics/objects/Crate.png +dropplet.tscn::PackedScene::273344889397887302::1778537253::0::1::::<><><>0<>0<><>::uid://w8ctpjxlfoih::::res://Scripts/dropplet.gd +game.tscn::PackedScene::4205340119192705573::1778537830::0::1::::<><><>0<>0<><>::uid://bc25u4w35ibeu::::res://Scripts/gameController.gd<>uid://bsroh4vsjwblh::::res://Scenes/crate.tscn<>uid://b2otvelhtq7en::::res://Scripts/SceneManager.gd<>uid://dmk1mp1hqm62b::::res://Scenes/player.tscn<>uid://4hekg0d8n04f::::res://Scripts/trigger.gd<>uid://ceyxo0mrrrd6d::::res://Scenes/grenade.tscn<>uid://nhqfqpjecvt8::::res://Scripts/fluid_container.gd<>uid://b12wjykuncw11::::res://Matirials/FluidPartical.tres<>uid://d5n7kwhkl4le::::res://Scenes/dropplet.tscn<>uid://bvte4ugmua4n3::::res://Scripts/Fluid.gdshader +grenade.tscn::PackedScene::5104564632401262693::1778542906::0::1::::<><><>0<>0<><>::uid://jrqdl3mm7rly::::res://Scripts/grenade.gd<>uid://cxcodns65xvhr::::res://assets/graphics/objects/grenade.png +player.tscn::PackedScene::8023772851970181075::1778544876::0::1::::<><><>0<>0<><>::uid://btmoyp0rwqmxe::::res://Scripts/player.gd<>uid://c87goe3qmmrv0::::res://assets/graphics/player/Running/player run 48x48.png<>uid://p72rbg7thsvi::::res://assets/graphics/player/idle/Player Idle 48x48.png<>uid://b524p0lnj8ftn::::res://assets/graphics/player/jump_fall/player jump 48x48.png +::res://Scripts/::1778539879 +crate.gd::GDScript::8372856115375017::1778537253::0::1::::Crate<>RigidBody2D<><>0<>0<><>:: +dropplet.gd::GDScript::1612435192803830343::1778537253::0::1::::<>RigidBody2D<><>0<>0<><>:: +Fluid.gdshader::Shader::3899905293721039882::1778537830::0::1::::<><><>0<>0<><>:: +fluid_container.gd::GDScript::927886876386663595::1778537253::0::1::::<>Node2D<><>0<>0<><>:: +gameController.gd::GDScript::2584395354465320640::1778537253::0::1::::GameController<>Node2D<><>0<>0<><>:: +grenade.gd::GDScript::667771465401199890::1778537253::0::1::::Grenade<>RigidBody2D<><>0<>0<><>:: +player.gd::GDScript::3745674970089689346::1778539879::0::1::::Player<>CharacterBody2D<><>0<>0<><>:: +SceneManager.gd::GDScript::4311612102441731429::1778537253::0::1::::SceneManager<>Node2D<><>0<>0<><>:: +trigger.gd::GDScript::2050188189632629851::1778537253::0::1::::Trigger<>Area2D<><>0<>0<><>:: diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 4213e60..f89d368 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,3 +1,7 @@ res://Scenes/game.tscn res://Matirials/FluidPartical.tres res://Scripts/Fluid.gdshader +res://Scripts/player.gd +res://Scenes/player.tscn +res://Scenes/crate.tscn +res://Scenes/grenade.tscn diff --git a/.godot/editor/game.tscn-editstate-d45e16ca8d170891778b9dcfa9c69e68.cfg b/.godot/editor/game.tscn-editstate-d45e16ca8d170891778b9dcfa9c69e68.cfg index 19731b5..af291b4 100644 --- a/.godot/editor/game.tscn-editstate-d45e16ca8d170891778b9dcfa9c69e68.cfg +++ b/.godot/editor/game.tscn-editstate-d45e16ca8d170891778b9dcfa9c69e68.cfg @@ -5,7 +5,7 @@ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-610.5001, -38.400017), +"ofs": Vector2(-1418.9598, -375.95612), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -31,7 +31,7 @@ "snap_rotation_step": 0.2617994, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.9090909 +"zoom": 0.3855432 } 3D={ "fov": 70.01, diff --git a/.godot/editor/game.tscn-folding-d45e16ca8d170891778b9dcfa9c69e68.cfg b/.godot/editor/game.tscn-folding-d45e16ca8d170891778b9dcfa9c69e68.cfg index a7e572d..c81f2e0 100644 --- a/.godot/editor/game.tscn-folding-d45e16ca8d170891778b9dcfa9c69e68.cfg +++ b/.godot/editor/game.tscn-folding-d45e16ca8d170891778b9dcfa9c69e68.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("platform"), PackedStringArray("Transform"), NodePath("WorldFloor"), PackedStringArray("Transform"), NodePath("destroyer"), PackedStringArray("Transform"), NodePath("destroyer/CollisionShape2D"), PackedStringArray("Transform"), NodePath("Crates/Crate"), PackedStringArray("Transform"), NodePath("Crates/Crate2"), PackedStringArray("Transform"), NodePath("FluidContainer"), PackedStringArray("Transform"), NodePath("FluidContainer/MultiMeshInstance2D"), PackedStringArray("Material", "material", "multimesh", "texture"), NodePath("BackBufferCopy/ColorRect"), PackedStringArray("Material", "material"), NodePath("Box/StaticBody2D4"), PackedStringArray("Transform"), NodePath("Box/StaticBody2D3"), PackedStringArray("Transform")] -resource_unfolds=["res://Scenes/game.tscn::RectangleShape2D_2poj3", PackedStringArray("Resource"), "res://Scenes/game.tscn::WorldBoundaryShape2D_2poj3", PackedStringArray("Resource"), "res://Scenes/game.tscn::CircleShape2D_3dryh", PackedStringArray("Resource"), "res://Scenes/game.tscn::CanvasItemMaterial_o5yvi", PackedStringArray(), "res://Scenes/game.tscn::MultiMesh_v158k", PackedStringArray("mesh"), "res://Scenes/dropplet.tscn::PhysicsMaterial_l34re", PackedStringArray(), "res://Scenes/game.tscn::ShaderMaterial_o5yvi", PackedStringArray("Shader Parameters"), "res://Scenes/game.tscn::RectangleShape2D_ldgsr", PackedStringArray()] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("TileMapLayer"), PackedStringArray("tile_set", "Transform"), NodePath("platform"), PackedStringArray("Transform"), NodePath("WorldFloor"), PackedStringArray("Transform"), NodePath("destroyer"), PackedStringArray("Transform"), NodePath("destroyer/CollisionShape2D"), PackedStringArray("Transform"), NodePath("Crates/Crate"), PackedStringArray("Transform"), NodePath("Crates/Crate2"), PackedStringArray("Transform"), NodePath("FluidContainer"), PackedStringArray("Transform"), NodePath("FluidContainer/MultiMeshInstance2D"), PackedStringArray("Material", "material", "multimesh", "texture"), NodePath("BackBufferCopy/ColorRect"), PackedStringArray("Material", "material"), NodePath("Box/StaticBody2D4"), PackedStringArray("Transform"), NodePath("Box/StaticBody2D3"), PackedStringArray("Transform")] +resource_unfolds=["res://Scenes/game.tscn::TileSet_rfjv2", PackedStringArray("terrain_set_0/terrain__array", "physics_layer__array"), "res://Scenes/game.tscn::RectangleShape2D_2poj3", PackedStringArray("Resource"), "res://Scenes/game.tscn::WorldBoundaryShape2D_2poj3", PackedStringArray("Resource"), "res://Scenes/game.tscn::CircleShape2D_3dryh", PackedStringArray("Resource"), "res://Scenes/game.tscn::CanvasItemMaterial_o5yvi", PackedStringArray(), "res://Scenes/game.tscn::MultiMesh_v158k", PackedStringArray("mesh"), "res://Scenes/dropplet.tscn::PhysicsMaterial_l34re", PackedStringArray(), "res://Scenes/game.tscn::ShaderMaterial_o5yvi", PackedStringArray("Shader Parameters"), "res://Scenes/game.tscn::RectangleShape2D_ldgsr", PackedStringArray()] nodes_folded=[NodePath("WorldFloor"), NodePath("Crates"), NodePath("Box/StaticBody2D")] diff --git a/.godot/editor/grenade.tscn-editstate-d8eeb790e4a079f4a11c3aee15bad01f.cfg b/.godot/editor/grenade.tscn-editstate-d8eeb790e4a079f4a11c3aee15bad01f.cfg index b2a8783..a3edf55 100644 --- a/.godot/editor/grenade.tscn-editstate-d8eeb790e4a079f4a11c3aee15bad01f.cfg +++ b/.godot/editor/grenade.tscn-editstate-d8eeb790e4a079f4a11c3aee15bad01f.cfg @@ -5,7 +5,7 @@ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-22.505413, -13.515947), +"ofs": Vector2(-45.044388, -18.698828), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -31,7 +31,7 @@ "snap_rotation_step": 0.2617994, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 14.421002 +"zoom": 17.449413 } 3D={ "fov": 70.01, @@ -189,4 +189,4 @@ Anim={ "visible": false } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Grenade")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Grenade/Sprite2D")]) diff --git a/.godot/editor/grenade.tscn-folding-d8eeb790e4a079f4a11c3aee15bad01f.cfg b/.godot/editor/grenade.tscn-folding-d8eeb790e4a079f4a11c3aee15bad01f.cfg index e180c77..940361a 100644 --- a/.godot/editor/grenade.tscn-folding-d8eeb790e4a079f4a11c3aee15bad01f.cfg +++ b/.godot/editor/grenade.tscn-folding-d8eeb790e4a079f4a11c3aee15bad01f.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Solver"), NodePath("CollisionShape2D"), PackedStringArray("shape")] +node_unfolds=[NodePath("."), PackedStringArray("Solver"), NodePath("CollisionShape2D"), PackedStringArray("shape"), NodePath("Sprite2D"), PackedStringArray("Texture")] resource_unfolds=["res://Scenes/grenade.tscn::CircleShape2D_b5j7x", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg b/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg index b35f055..bcac65f 100644 --- a/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg +++ b/.godot/editor/player.tscn-editstate-1753c997600d68ab5d20ae99fddb15c6.cfg @@ -5,7 +5,7 @@ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-28.522625, -16.533838), +"ofs": Vector2(-641.0427, -240.68599), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -31,7 +31,7 @@ "snap_rotation_step": 0.2617994, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 14.421002 +"zoom": 1.21 } 3D={ "fov": 70.01, @@ -189,4 +189,4 @@ Anim={ "visible": false } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Player/PlayerGraphic")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Player/Camera2D")]) diff --git a/.godot/editor/player.tscn-folding-1753c997600d68ab5d20ae99fddb15c6.cfg b/.godot/editor/player.tscn-folding-1753c997600d68ab5d20ae99fddb15c6.cfg index 0dff476..012e4ab 100644 --- a/.godot/editor/player.tscn-folding-1753c997600d68ab5d20ae99fddb15c6.cfg +++ b/.godot/editor/player.tscn-folding-1753c997600d68ab5d20ae99fddb15c6.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Texture")] +node_unfolds=[NodePath("."), PackedStringArray("Texture"), NodePath("Camera2D"), PackedStringArray("Position Smoothing", "Rotation Smoothing")] resource_unfolds=["res://Scenes/player.tscn::CircleShape2D_2poj3", PackedStringArray(), "res://Scenes/player.tscn::SpriteFrames_ukyrk", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 0f686e7..c807dec 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -14,10 +14,10 @@ scripts=["res://Scripts/gameController.gd", "res://Scripts/dropplet.gd", "res:// [debug_options] -run_debug_collisions=false -run_debug_paths=true -run_debug_navigation=true -run_debug_avoidance=true +run_debug_collisions=true +run_debug_paths=false +run_debug_navigation=false +run_debug_avoidance=false [script_setup] @@ -39,7 +39,7 @@ last_mode=1 [color_picker] -recent_presets=PackedColorArray(0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0.6762856, 0.5062908, 0, 0.41960785, 0, 0.6, 0.69803923, 1, 0.81547993, 0.40661094, 1.1551381e-06, 1, 0, 0, 0, 1) +recent_presets=PackedColorArray(0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0.6762856, 0.5062908, 0, 0.41960785, 0, 0.6, 0.69803923, 1, 0.81547993, 0.40661094, 1.1551381e-06, 1, 0, 0, 0, 1, 1, 0, 0, 1) picker_shape=3 [shader_setup] diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs index 8dc9934..971820b 100644 --- a/.godot/editor/recent_dirs +++ b/.godot/editor/recent_dirs @@ -1,3 +1,4 @@ +res://assets/graphics/player/jump_fall/ res://assets/graphics/player/Running/ res://assets/graphics/player/idle/ res://Scenes/ diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index c4a4325..a154cd9 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 28, +"column": 33, "folded_lines": PackedInt32Array(), "h_scroll_position": 0, -"row": 95, -"scroll_position": 63.0, +"row": 100, +"scroll_position": 93.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex b/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex new file mode 100644 index 0000000..62a0e09 Binary files /dev/null and b/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex differ diff --git a/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.md5 b/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.md5 new file mode 100644 index 0000000..0a90ffe --- /dev/null +++ b/.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.md5 @@ -0,0 +1,3 @@ +source_md5="8f663f2fc1e913cf8b87d95613360a96" +dest_md5="8b6eaf5b45824bcd5042984fbfc7ee54" + diff --git a/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex b/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex new file mode 100644 index 0000000..b46a0c9 Binary files /dev/null and b/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex differ diff --git a/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.md5 b/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.md5 new file mode 100644 index 0000000..d0174b3 --- /dev/null +++ b/.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.md5 @@ -0,0 +1,3 @@ +source_md5="d0cf8881b1dd58114262fb591f83d61c" +dest_md5="490521eb3b59750af974a90b3e541464" + diff --git a/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex b/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex new file mode 100644 index 0000000..a6065e8 Binary files /dev/null and b/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex differ diff --git a/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.md5 b/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.md5 new file mode 100644 index 0000000..7fdc3c4 --- /dev/null +++ b/.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.md5 @@ -0,0 +1,3 @@ +source_md5="b429375d69333fb8a218df3ee8cbc58c" +dest_md5="f9fecd0ed86560abcf68236f0ac2a9cf" + diff --git a/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex b/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex new file mode 100644 index 0000000..af59096 Binary files /dev/null and b/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex differ diff --git a/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.md5 b/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.md5 new file mode 100644 index 0000000..967dbb7 --- /dev/null +++ b/.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.md5 @@ -0,0 +1,3 @@ +source_md5="51ff05172000b6f9710a553b3750c424" +dest_md5="1c589c5013cfa6ae976ebfda12928785" + diff --git a/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex b/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex new file mode 100644 index 0000000..2d9c139 Binary files /dev/null and b/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex differ diff --git a/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.md5 b/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.md5 new file mode 100644 index 0000000..a4cf431 --- /dev/null +++ b/.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.md5 @@ -0,0 +1,3 @@ +source_md5="3965a7fc3ac34df639faae2a8c735716" +dest_md5="92d3140b8220302c5d73545395d11587" + diff --git a/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex b/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex new file mode 100644 index 0000000..3d168ed Binary files /dev/null and b/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex differ diff --git a/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.md5 b/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.md5 new file mode 100644 index 0000000..3877f67 --- /dev/null +++ b/.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.md5 @@ -0,0 +1,3 @@ +source_md5="fab02d9d6e113d5e5e8c42b8d4ac2379" +dest_md5="0a8d9b83fb8b2c16f43030547486135a" + diff --git a/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex b/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex new file mode 100644 index 0000000..397d773 Binary files /dev/null and b/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex differ diff --git a/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.md5 b/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.md5 new file mode 100644 index 0000000..b340ce6 --- /dev/null +++ b/.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.md5 @@ -0,0 +1,3 @@ +source_md5="82a97cfa831c9d7d5d6bc68db7955aa3" +dest_md5="0a1fdae5e7f20fd9f11bbc8595df4e29" + diff --git a/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex b/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex index 1dc2a59..e70d4dd 100644 Binary files a/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex and b/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.ctex differ diff --git a/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.md5 b/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.md5 index ef55599..d7b8528 100644 --- a/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.md5 +++ b/.godot/imported/Player Idle 48x48.png-9f43f14976963a2821a06ddf8579a76a.md5 @@ -1,3 +1,3 @@ -source_md5="25eca82a8943e0cb7df742fc2f8287eb" -dest_md5="b2f5daa7ae142788184602c73449164d" +source_md5="1cde903420511148b5f2379516473a46" +dest_md5="868b49319ffda08bc0b495e29dbb87e3" diff --git a/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex b/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex new file mode 100644 index 0000000..67efbac Binary files /dev/null and b/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex differ diff --git a/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.md5 b/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.md5 new file mode 100644 index 0000000..a8145f8 --- /dev/null +++ b/.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.md5 @@ -0,0 +1,3 @@ +source_md5="6d4500de01f9aac6bf4ec83620a1f34d" +dest_md5="3029ed721ce199bc52cf5084373ca70f" + diff --git a/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex b/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex new file mode 100644 index 0000000..d2e6db2 Binary files /dev/null and b/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex differ diff --git a/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.md5 b/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.md5 new file mode 100644 index 0000000..9dbd6bc --- /dev/null +++ b/.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.md5 @@ -0,0 +1,3 @@ +source_md5="32c25d5ee4a6233bebc766fa35137e71" +dest_md5="ce7ae311c93d679b1e78b8ffe8feb4ae" + diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index 09a65b0..ad2aa7e 100644 Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ diff --git a/Scenes/crate.tscn b/Scenes/crate.tscn index d19a727..31a9e51 100644 --- a/Scenes/crate.tscn +++ b/Scenes/crate.tscn @@ -1,6 +1,7 @@ [gd_scene format=3 uid="uid://bsroh4vsjwblh"] [ext_resource type="Script" uid="uid://eb5ucqehuof" path="res://Scripts/crate.gd" id="1_wp72f"] +[ext_resource type="Texture2D" uid="uid://by11sgqh2p1n0" path="res://assets/graphics/objects/Crate.png" id="2_i4r3v"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ebmjs"] @@ -11,3 +12,9 @@ metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=839343056] shape = SubResource("RectangleShape2D_ebmjs") debug_color = Color(0.8535397, 0.36730364, 0.11225829, 0.41960785) + +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=664397442] +texture_filter = 1 +position = Vector2(5.9604645e-08, 5.9604645e-08) +scale = Vector2(0.55, 0.55) +texture = ExtResource("2_i4r3v") diff --git a/Scenes/game.tscn b/Scenes/game.tscn index e34324a..dfea847 100644 --- a/Scenes/game.tscn +++ b/Scenes/game.tscn @@ -1,8 +1,10 @@ -[gd_scene format=3 uid="uid://b06dlp8n6upld"] +[gd_scene format=4 uid="uid://b06dlp8n6upld"] [ext_resource type="Script" uid="uid://bc25u4w35ibeu" path="res://Scripts/gameController.gd" id="1_qxrlw"] [ext_resource type="PackedScene" uid="uid://bsroh4vsjwblh" path="res://Scenes/crate.tscn" id="2_3dryh"] +[ext_resource type="Texture2D" uid="uid://ww4meop2wv0c" path="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png" id="2_o5yvi"] [ext_resource type="Script" uid="uid://b2otvelhtq7en" path="res://Scripts/SceneManager.gd" id="2_wowpa"] +[ext_resource type="Texture2D" uid="uid://piu5ajlnnrqx" path="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png" id="3_rku1e"] [ext_resource type="PackedScene" uid="uid://dmk1mp1hqm62b" path="res://Scenes/player.tscn" id="3_wowpa"] [ext_resource type="Script" uid="uid://4hekg0d8n04f" path="res://Scripts/trigger.gd" id="3_wrm1d"] [ext_resource type="PackedScene" uid="uid://ceyxo0mrrrd6d" path="res://Scenes/grenade.tscn" id="6_h4fw4"] @@ -11,6 +13,390 @@ [ext_resource type="PackedScene" uid="uid://d5n7kwhkl4le" path="res://Scenes/dropplet.tscn" id="8_ldgsr"] [ext_resource type="Shader" uid="uid://bvte4ugmua4n3" path="res://Scripts/Fluid.gdshader" id="10_ldgsr"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rku1e"] +texture = ExtResource("2_o5yvi") +texture_region_size = Vector2i(512, 512) +0:3/0 = 0 +0:3/0/terrain_set = 0 +0:3/0/terrain = 0 +0:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(33.359497, -256, 256, -256, 256, 256, 22.239685, 256) +0:3/0/terrains_peering_bit/right_side = 0 +0:0/0 = 0 +0:0/0/terrain_set = 0 +0:0/0/terrain = 0 +0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +0:0/0/terrains_peering_bit/right_side = 0 +0:0/0/terrains_peering_bit/bottom_right_corner = 0 +0:0/0/terrains_peering_bit/bottom_side = 0 +1:0/0 = 0 +1:0/0/terrain_set = 0 +1:0/0/terrain = 0 +1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +1:0/0/terrains_peering_bit/right_side = 0 +1:0/0/terrains_peering_bit/bottom_right_corner = 0 +1:0/0/terrains_peering_bit/bottom_side = 0 +1:0/0/terrains_peering_bit/bottom_left_corner = 0 +1:0/0/terrains_peering_bit/left_side = 0 +1:1/0 = 0 +1:1/0/terrain_set = 0 +1:1/0/terrain = 0 +1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +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 +1:1/0/terrains_peering_bit/bottom_left_corner = 0 +1:1/0/terrains_peering_bit/left_side = 0 +1:1/0/terrains_peering_bit/top_left_corner = 0 +1:1/0/terrains_peering_bit/top_side = 0 +1:1/0/terrains_peering_bit/top_right_corner = 0 +2:1/0 = 0 +2:1/0/terrain_set = 0 +2:1/0/terrain = 0 +2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +2:1/0/terrains_peering_bit/bottom_side = 0 +2:1/0/terrains_peering_bit/bottom_left_corner = 0 +2:1/0/terrains_peering_bit/left_side = 0 +2:1/0/terrains_peering_bit/top_left_corner = 0 +2:1/0/terrains_peering_bit/top_side = 0 +2:0/0 = 0 +2:0/0/terrain_set = 0 +2:0/0/terrain = 0 +2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +2:0/0/terrains_peering_bit/bottom_side = 0 +2:0/0/terrains_peering_bit/bottom_left_corner = 0 +2:0/0/terrains_peering_bit/left_side = 0 +0:1/0 = 0 +0:1/0/terrain_set = 0 +0:1/0/terrain = 0 +0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +0:1/0/terrains_peering_bit/right_side = 0 +0:1/0/terrains_peering_bit/bottom_right_corner = 0 +0:1/0/terrains_peering_bit/bottom_side = 0 +0:1/0/terrains_peering_bit/top_side = 0 +0:1/0/terrains_peering_bit/top_right_corner = 0 +1:2/0 = 0 +1:2/0/terrain_set = 0 +1:2/0/terrain = 0 +1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +1:2/0/terrains_peering_bit/right_side = 0 +1:2/0/terrains_peering_bit/left_side = 0 +1:2/0/terrains_peering_bit/top_left_corner = 0 +1:2/0/terrains_peering_bit/top_side = 0 +1:2/0/terrains_peering_bit/top_right_corner = 0 +2:2/0 = 0 +2:2/0/terrain_set = 0 +2:2/0/terrain = 0 +2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +2:2/0/terrains_peering_bit/left_side = 0 +2:2/0/terrains_peering_bit/top_left_corner = 0 +2:2/0/terrains_peering_bit/top_side = 0 +0:2/0 = 0 +0:2/0/terrain_set = 0 +0:2/0/terrain = 0 +0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +0:2/0/terrains_peering_bit/right_side = 0 +0:2/0/terrains_peering_bit/top_side = 0 +0:2/0/terrains_peering_bit/top_right_corner = 0 +3:0/0 = 0 +3:0/0/terrain_set = 0 +3:0/0/terrain = 0 +3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +3:0/0/terrains_peering_bit/bottom_side = 0 +3:1/0 = 0 +3:1/0/terrain_set = 0 +3:1/0/terrain = 0 +3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +3:1/0/terrains_peering_bit/bottom_side = 0 +3:1/0/terrains_peering_bit/top_side = 0 +3:2/0 = 0 +3:2/0/terrain_set = 0 +3:2/0/terrain = 0 +3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +3:2/0/terrains_peering_bit/top_side = 0 +3:3/0 = 0 +3:3/0/terrain_set = 0 +3:3/0/terrain = 0 +3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +2:4/0 = 0 +2:4/0/terrain_set = 0 +2:4/0/terrain = 0 +2:4/0/terrains_peering_bit/right_side = 0 +2:4/0/terrains_peering_bit/bottom_side = 0 +2:4/0/terrains_peering_bit/bottom_left_corner = 0 +2:4/0/terrains_peering_bit/left_side = 0 +1:3/0 = 0 +1:3/0/terrain_set = 0 +1:3/0/terrain = 0 +1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, 256, -256, 256, 256, -256, 256) +1:3/0/terrains_peering_bit/right_side = 0 +1:3/0/terrains_peering_bit/left_side = 0 +2:3/0 = 0 +2:3/0/terrain_set = 0 +2:3/0/terrain = 0 +2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-256, -256, -44.47937, -256, -55.599182, 256, -256, 256) +2: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/terrains_peering_bit/right_side = 0 +0:4/0/terrains_peering_bit/bottom_side = 0 +0:4/0/terrains_peering_bit/top_side = 0 +0:4/0/terrains_peering_bit/top_right_corner = 0 +1:4/0 = 0 +1:4/0/terrain_set = 0 +1:4/0/terrain = 0 +1:4/0/terrains_peering_bit/bottom_side = 0 +1:4/0/terrains_peering_bit/left_side = 0 +1:4/0/terrains_peering_bit/top_left_corner = 0 +1:4/0/terrains_peering_bit/top_side = 0 +0:5/0 = 0 +0:5/0/terrain_set = 0 +0:5/0/terrain = 0 +0:5/0/terrains_peering_bit/right_side = 0 +0:5/0/terrains_peering_bit/bottom_right_corner = 0 +0:5/0/terrains_peering_bit/bottom_side = 0 +0:5/0/terrains_peering_bit/top_side = 0 +1:5/0 = 0 +1:5/0/terrain_set = 0 +1:5/0/terrain = 0 +1:5/0/terrains_peering_bit/bottom_side = 0 +1:5/0/terrains_peering_bit/bottom_left_corner = 0 +1:5/0/terrains_peering_bit/left_side = 0 +1:5/0/terrains_peering_bit/top_side = 0 +0:6/0 = 0 +0:6/0/terrain_set = 0 +0:6/0/terrains_peering_bit/right_side = 0 +0:6/0/terrains_peering_bit/bottom_right_corner = 0 +0:6/0/terrains_peering_bit/bottom_side = 0 +0:6/0/terrains_peering_bit/bottom_left_corner = 0 +0:6/0/terrains_peering_bit/left_side = 0 +0:6/0/terrains_peering_bit/top_left_corner = 0 +0:6/0/terrains_peering_bit/top_side = 0 +0:6/0/terrains_peering_bit/top_right_corner = 0 +1:6/0 = 0 +1:6/0/terrain_set = 0 +1:6/0/terrains_peering_bit/right_side = 0 +1:6/0/terrains_peering_bit/bottom_right_corner = 0 +1:6/0/terrains_peering_bit/bottom_side = 0 +1:6/0/terrains_peering_bit/bottom_left_corner = 0 +1:6/0/terrains_peering_bit/left_side = 0 +1:6/0/terrains_peering_bit/top_left_corner = 0 +1:6/0/terrains_peering_bit/top_side = 0 +1:6/0/terrains_peering_bit/top_right_corner = 0 +2:6/0 = 0 +2:6/0/terrain_set = 0 +2:6/0/terrain = 0 +2:6/0/terrains_peering_bit/right_side = 0 +2:6/0/terrains_peering_bit/bottom_right_corner = 0 +2:6/0/terrains_peering_bit/bottom_side = 0 +2:6/0/terrains_peering_bit/left_side = 0 +2:6/0/terrains_peering_bit/top_left_corner = 0 +2:6/0/terrains_peering_bit/top_side = 0 +3:6/0 = 0 +3:6/0/terrain_set = 0 +3:6/0/terrain = 0 +3:6/0/terrains_peering_bit/right_side = 0 +3:6/0/terrains_peering_bit/bottom_side = 0 +3:6/0/terrains_peering_bit/bottom_left_corner = 0 +3:6/0/terrains_peering_bit/left_side = 0 +3:6/0/terrains_peering_bit/top_side = 0 +3:6/0/terrains_peering_bit/top_right_corner = 0 +4:6/0 = 0 +4:6/0/terrain_set = 0 +4:6/0/terrain = 0 +4:6/0/terrains_peering_bit/right_side = 0 +4:6/0/terrains_peering_bit/top_side = 0 +5:6/0 = 0 +5:6/0/terrain_set = 0 +5:6/0/terrain = 0 +5:6/0/terrains_peering_bit/right_side = 0 +5:6/0/terrains_peering_bit/left_side = 0 +5:6/0/terrains_peering_bit/top_side = 0 +6:6/0 = 0 +6:6/0/terrain_set = 0 +6:6/0/terrain = 0 +6:6/0/terrains_peering_bit/left_side = 0 +6:6/0/terrains_peering_bit/top_side = 0 +6:5/0 = 0 +6:5/0/terrain_set = 0 +6:5/0/terrain = 0 +6:5/0/terrains_peering_bit/bottom_side = 0 +6:5/0/terrains_peering_bit/left_side = 0 +6:5/0/terrains_peering_bit/top_side = 0 +5:5/0 = 0 +5:5/0/terrain_set = 0 +5:5/0/terrain = 0 +5:5/0/terrains_peering_bit/right_side = 0 +5:5/0/terrains_peering_bit/bottom_side = 0 +5:5/0/terrains_peering_bit/left_side = 0 +5:5/0/terrains_peering_bit/top_side = 0 +4:5/0 = 0 +4:5/0/terrain_set = 0 +4:5/0/terrain = 0 +4:5/0/terrains_peering_bit/right_side = 0 +4:5/0/terrains_peering_bit/bottom_side = 0 +4:5/0/terrains_peering_bit/top_side = 0 +3:5/0 = 0 +3:5/0/terrain_set = 0 +3:5/0/terrain = 0 +3:5/0/terrains_peering_bit/right_side = 0 +3:5/0/terrains_peering_bit/left_side = 0 +3:5/0/terrains_peering_bit/top_side = 0 +3:5/0/terrains_peering_bit/top_right_corner = 0 +2:5/0 = 0 +2:5/0/terrain_set = 0 +2:5/0/terrain = 0 +2:5/0/terrains_peering_bit/right_side = 0 +2:5/0/terrains_peering_bit/left_side = 0 +2:5/0/terrains_peering_bit/top_left_corner = 0 +2:5/0/terrains_peering_bit/top_side = 0 +3:4/0 = 0 +3:4/0/terrain_set = 0 +3:4/0/terrain = 0 +3:4/0/terrains_peering_bit/right_side = 0 +3:4/0/terrains_peering_bit/bottom_right_corner = 0 +3:4/0/terrains_peering_bit/bottom_side = 0 +3: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/terrains_peering_bit/right_side = 0 +4:4/0/terrains_peering_bit/bottom_side = 0 +5:4/0 = 0 +5:4/0/terrain_set = 0 +5:4/0/terrain = 0 +5:4/0/terrains_peering_bit/right_side = 0 +5:4/0/terrains_peering_bit/bottom_side = 0 +5:4/0/terrains_peering_bit/left_side = 0 +6:4/0 = 0 +6:4/0/terrain_set = 0 +6:4/0/terrain = 0 +6:4/0/terrains_peering_bit/bottom_side = 0 +6:4/0/terrains_peering_bit/left_side = 0 +6:3/0 = 0 +6:3/0/terrain_set = 0 +6:3/0/terrain = 0 +6:3/0/terrains_peering_bit/right_side = 0 +6:3/0/terrains_peering_bit/bottom_side = 0 +6:3/0/terrains_peering_bit/left_side = 0 +6:3/0/terrains_peering_bit/top_left_corner = 0 +6:3/0/terrains_peering_bit/top_side = 0 +6:3/0/terrains_peering_bit/top_right_corner = 0 +5:3/0 = 0 +5:3/0/terrain_set = 0 +5:3/0/terrain = 0 +5:3/0/terrains_peering_bit/right_side = 0 +5:3/0/terrains_peering_bit/bottom_right_corner = 0 +5:3/0/terrains_peering_bit/bottom_side = 0 +5:3/0/terrains_peering_bit/left_side = 0 +5:3/0/terrains_peering_bit/top_side = 0 +4:3/0 = 0 +4:3/0/terrain_set = 0 +4:3/0/terrain = 0 +4:3/0/terrains_peering_bit/right_side = 0 +4:3/0/terrains_peering_bit/bottom_side = 0 +4:3/0/terrains_peering_bit/left_side = 0 +4:3/0/terrains_peering_bit/top_left_corner = 0 +4:3/0/terrains_peering_bit/top_side = 0 +4:2/0 = 0 +4:2/0/terrain_set = 0 +4:2/0/terrain = 0 +4:2/0/terrains_peering_bit/right_side = 0 +4:2/0/terrains_peering_bit/bottom_side = 0 +4:2/0/terrains_peering_bit/bottom_left_corner = 0 +4:2/0/terrains_peering_bit/left_side = 0 +4:2/0/terrains_peering_bit/top_side = 0 +5:2/0 = 0 +5:2/0/terrain_set = 0 +5:2/0/terrain = 0 +5:2/0/terrains_peering_bit/right_side = 0 +5:2/0/terrains_peering_bit/bottom_side = 0 +5:2/0/terrains_peering_bit/left_side = 0 +5:2/0/terrains_peering_bit/top_side = 0 +5:2/0/terrains_peering_bit/top_right_corner = 0 +6:2/0 = 0 +6:2/0/terrain_set = 0 +6:2/0/terrain = 0 +6:2/0/terrains_peering_bit/right_side = 0 +6:2/0/terrains_peering_bit/bottom_side = 0 +6:2/0/terrains_peering_bit/bottom_left_corner = 0 +6:2/0/terrains_peering_bit/left_side = 0 +6:2/0/terrains_peering_bit/top_left_corner = 0 +6:2/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/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 +6:1/0/terrains_peering_bit/left_side = 0 +6:1/0/terrains_peering_bit/top_side = 0 +6:1/0/terrains_peering_bit/top_right_corner = 0 +5:1/0 = 0 +5:1/0/terrain_set = 0 +5:1/0/terrain = 0 +5:1/0/terrains_peering_bit/right_side = 0 +5:1/0/terrains_peering_bit/bottom_right_corner = 0 +5:1/0/terrains_peering_bit/bottom_side = 0 +5:1/0/terrains_peering_bit/bottom_left_corner = 0 +5:1/0/terrains_peering_bit/left_side = 0 +5:1/0/terrains_peering_bit/top_side = 0 +5:1/0/terrains_peering_bit/top_right_corner = 0 +4:1/0 = 0 +4:1/0/terrain_set = 0 +4:1/0/terrain = 0 +4:1/0/terrains_peering_bit/right_side = 0 +4:1/0/terrains_peering_bit/bottom_right_corner = 0 +4:1/0/terrains_peering_bit/bottom_side = 0 +4:1/0/terrains_peering_bit/bottom_left_corner = 0 +4:1/0/terrains_peering_bit/left_side = 0 +4:1/0/terrains_peering_bit/top_left_corner = 0 +4:1/0/terrains_peering_bit/top_side = 0 +4:0/0 = 0 +4:0/0/terrain_set = 0 +4:0/0/terrain = 0 +4:0/0/terrains_peering_bit/right_side = 0 +4:0/0/terrains_peering_bit/bottom_side = 0 +4:0/0/terrains_peering_bit/bottom_left_corner = 0 +4:0/0/terrains_peering_bit/left_side = 0 +4:0/0/terrains_peering_bit/top_left_corner = 0 +4:0/0/terrains_peering_bit/top_side = 0 +4:0/0/terrains_peering_bit/top_right_corner = 0 +5:0/0 = 0 +5:0/0/terrain_set = 0 +5:0/0/terrain = 0 +5:0/0/terrains_peering_bit/right_side = 0 +5:0/0/terrains_peering_bit/bottom_right_corner = 0 +5:0/0/terrains_peering_bit/bottom_side = 0 +5:0/0/terrains_peering_bit/left_side = 0 +5:0/0/terrains_peering_bit/top_left_corner = 0 +5:0/0/terrains_peering_bit/top_side = 0 +5:0/0/terrains_peering_bit/top_right_corner = 0 +6:0/0 = 0 +6:0/0/terrain_set = 0 +6:0/0/terrain = 0 +6:0/0/terrains_peering_bit/right_side = 0 +6:0/0/terrains_peering_bit/bottom_right_corner = 0 +6:0/0/terrains_peering_bit/bottom_side = 0 +6:0/0/terrains_peering_bit/bottom_left_corner = 0 +6:0/0/terrains_peering_bit/left_side = 0 +6:0/0/terrains_peering_bit/top_side = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_rfjv2"] +texture = ExtResource("3_rku1e") +texture_region_size = Vector2i(512, 512) + +[sub_resource type="TileSet" id="TileSet_rfjv2"] +tile_size = Vector2i(512, 512) +physics_layer_0/collision_layer = 1 +terrain_set_0/mode = 0 +terrain_set_0/terrain_0/name = "normal" +terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1) +terrain_set_0/terrain_1/name = "forground 1" +terrain_set_0/terrain_1/color = Color(0.5, 0.4375, 0.25, 1) +sources/0 = SubResource("TileSetAtlasSource_rku1e") +sources/1 = SubResource("TileSetAtlasSource_rfjv2") + [sub_resource type="RectangleShape2D" id="RectangleShape2D_2poj3"] size = Vector2(178, 20) @@ -43,6 +429,11 @@ size = Vector2(33, 103) [node name="Game" type="Node2D" unique_id=1698001017] script = ExtResource("1_qxrlw") +[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=522097850] +scale = Vector2(0.05, 0.05) +tile_map_data = PackedByteArray("AAAHAA8AAAAAAAMAAAAIAA8AAAADAAUAAAAJAA8AAAACAAIAAAAKAA4AAAACAAMAAAAJAA4AAAACAAQAAAAIAA4AAAAAAAAAAAA=") +tile_set = SubResource("TileSet_rfjv2") + [node name="SceneManager" type="Node2D" parent="." unique_id=782186168] unique_name_in_owner = true script = ExtResource("2_wowpa") diff --git a/Scenes/grenade.tscn b/Scenes/grenade.tscn index 6e7111e..a162711 100644 --- a/Scenes/grenade.tscn +++ b/Scenes/grenade.tscn @@ -1,9 +1,10 @@ [gd_scene format=3 uid="uid://ceyxo0mrrrd6d"] [ext_resource type="Script" uid="uid://jrqdl3mm7rly" path="res://Scripts/grenade.gd" id="1_v44n1"] +[ext_resource type="Texture2D" uid="uid://cxcodns65xvhr" path="res://assets/graphics/objects/grenade.png" id="2_5rnft"] [sub_resource type="CircleShape2D" id="CircleShape2D_b5j7x"] -radius = 2.0 +radius = 8.0 [node name="Grenade" type="RigidBody2D" unique_id=1290284523] contact_monitor = true @@ -14,4 +15,10 @@ script = ExtResource("1_v44n1") shape = SubResource("CircleShape2D_b5j7x") debug_color = Color(0.81547993, 0.40661094, 1.1551381e-06, 1) +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1935858703] +texture_filter = 1 +position = Vector2(0, 1.000001) +scale = Vector2(2.0924313, 2.4917161) +texture = ExtResource("2_5rnft") + [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/Scenes/player.tscn b/Scenes/player.tscn index 1b8e070..f0f899a 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -3,6 +3,7 @@ [ext_resource type="Script" uid="uid://btmoyp0rwqmxe" path="res://Scripts/player.gd" id="1_v0iea"] [ext_resource type="Texture2D" uid="uid://c87goe3qmmrv0" path="res://assets/graphics/player/Running/player run 48x48.png" id="2_6t5aa"] [ext_resource type="Texture2D" uid="uid://p72rbg7thsvi" path="res://assets/graphics/player/idle/Player Idle 48x48.png" id="2_cvnsp"] +[ext_resource type="Texture2D" uid="uid://b524p0lnj8ftn" path="res://assets/graphics/player/jump_fall/player jump 48x48.png" id="3_vgqql"] [sub_resource type="CircleShape2D" id="CircleShape2D_2poj3"] @@ -38,6 +39,10 @@ region = Rect2(288, 0, 48, 48) atlas = ExtResource("2_6t5aa") region = Rect2(336, 0, 48, 48) +[sub_resource type="AtlasTexture" id="AtlasTexture_olqyp"] +atlas = ExtResource("3_vgqql") +region = Rect2(96, 0, 48, 48) + [sub_resource type="AtlasTexture" id="AtlasTexture_6t5aa"] atlas = ExtResource("2_cvnsp") region = Rect2(0, 0, 48, 48) @@ -78,6 +83,14 @@ region = Rect2(384, 0, 48, 48) atlas = ExtResource("2_cvnsp") region = Rect2(432, 0, 48, 48) +[sub_resource type="AtlasTexture" id="AtlasTexture_wpjfl"] +atlas = ExtResource("3_vgqql") +region = Rect2(0, 0, 48, 48) + +[sub_resource type="AtlasTexture" id="AtlasTexture_bi64h"] +atlas = ExtResource("3_vgqql") +region = Rect2(48, 0, 48, 48) + [sub_resource type="SpriteFrames" id="SpriteFrames_ukyrk"] animations = [{ "frames": [{ @@ -111,6 +124,14 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": SubResource("AtlasTexture_olqyp") +}], +"loop": false, +"name": &"fall", +"speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, "texture": SubResource("AtlasTexture_6t5aa") }, { "duration": 1.0, @@ -143,6 +164,17 @@ animations = [{ "loop": true, "name": &"idle", "speed": 12.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_wpjfl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_bi64h") +}], +"loop": false, +"name": &"jump", +"speed": 12.0 }] [node name="Player" type="CharacterBody2D" unique_id=56223176] @@ -169,6 +201,12 @@ position = Vector2(-15, -5) [node name="PlayerGraphic" type="AnimatedSprite2D" parent="." unique_id=1409812048] position = Vector2(0, -6) sprite_frames = SubResource("SpriteFrames_ukyrk") -animation = &"Run" +animation = &"fall" autoplay = "idle" -frame_progress = 0.013636588 + +[node name="Camera2D" type="Camera2D" parent="." unique_id=371485913] +offset = Vector2(0, -50) +position_smoothing_enabled = true +rotation_smoothing_enabled = true + +[connection signal="animation_finished" from="PlayerGraphic" to="." method="_on_player_graphic_animation_finished"] diff --git a/Scripts/player.gd b/Scripts/player.gd index c3afe53..4cbebfd 100644 --- a/Scripts/player.gd +++ b/Scripts/player.gd @@ -10,12 +10,14 @@ const JUMP_VELOCITY = -400.0 var direction enum FaceDirection{LEFT, RIGHT} var facing:FaceDirection = FaceDirection.RIGHT -enum State{IDLE,RUNNING} +enum State{IDLE,RUNNING,JUMPING,FALLING} var currentState:State = State.IDLE var pushTarget:RigidBody2D var pushEnabled:bool = false +var upJump:bool = false + func _physics_process(delta: float) -> void: handle_input() handle_movement(delta) @@ -42,6 +44,8 @@ func handle_input()->void: if Input.is_action_just_pressed("ui_accept") and is_on_floor(): velocity.y = JUMP_VELOCITY + upJump = true + currentState = State.JUMPING # Get the input direction and handle the movement/deceleration. # As good practice, you should replace UI actions with custom gameplay actions. @@ -94,9 +98,26 @@ func handle_state(): currentState = State.RUNNING State.RUNNING when velocity.x == 0: currentState = State.IDLE + State.JUMPING when velocity.y > 0: + currentState = State.FALLING + State.FALLING when velocity.y == 0: + currentState = State.IDLE func handle_animation(): match currentState: State.IDLE: player_graphic.play("idle") State.RUNNING: player_graphic.play("Run") + State.JUMPING: + if upJump: + player_graphic.play("jump") + State.FALLING: + if not upJump: + player_graphic.play("fall") + + + +func _on_player_graphic_animation_finished(): + match currentState: + State.JUMPING: + upJump = false diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png new file mode 100644 index 0000000..265b6f3 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png.import new file mode 100644 index 0000000..a14e9ac --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bifhrnp2c1a24" +path="res://.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - BackgroundDecoration.png" +dest_files=["res://.godot/imported/Mossy - BackgroundDecoration.png-7b60cd4033ff5660d85f2eb7fe86eab3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png new file mode 100644 index 0000000..c7ae981 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png.import new file mode 100644 index 0000000..9df5f7d --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ch1ac73ustebl" +path="res://.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Decorations&Hazards.png" +dest_files=["res://.godot/imported/Mossy - Decorations&Hazards.png-a51f8cd98b0b333bc6097b8b70915a57.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png new file mode 100644 index 0000000..96e9b66 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png.import new file mode 100644 index 0000000..036be77 --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dfo60ikuwmb8v" +path="res://.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - FloatingPlatforms.png" +dest_files=["res://.godot/imported/Mossy - FloatingPlatforms.png-724860f04b5c5ba3fb962ed66cba2cbe.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png new file mode 100644 index 0000000..7b4d0e5 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png.import new file mode 100644 index 0000000..56f1e25 --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cfdknv2xcawps" +path="res://.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - Hanging Plants.png" +dest_files=["res://.godot/imported/Mossy - Hanging Plants.png-272d5e0737d0a77dc7711992f55b816e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png new file mode 100644 index 0000000..703a2f4 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png.import new file mode 100644 index 0000000..ae10501 --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://piu5ajlnnrqx" +path="res://.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - MossyHills.png" +dest_files=["res://.godot/imported/Mossy - MossyHills.png-3dfd2cedaa38a324418a5095bd2f118c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png new file mode 100644 index 0000000..a0b28a9 Binary files /dev/null and b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png differ diff --git a/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png.import b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png.import new file mode 100644 index 0000000..9bdb3c5 --- /dev/null +++ b/assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ww4meop2wv0c" +path="res://.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/environments/Mossy Assets/Mossy Tileset/Mossy - TileSet.png" +dest_files=["res://.godot/imported/Mossy - TileSet.png-e345fe4c5537d0e2d37ab4fbbeb9152e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/objects/Crate.png b/assets/graphics/objects/Crate.png new file mode 100644 index 0000000..65b5e39 Binary files /dev/null and b/assets/graphics/objects/Crate.png differ diff --git a/assets/graphics/objects/Crate.png.import b/assets/graphics/objects/Crate.png.import new file mode 100644 index 0000000..6da01c1 --- /dev/null +++ b/assets/graphics/objects/Crate.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://by11sgqh2p1n0" +path="res://.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/objects/Crate.png" +dest_files=["res://.godot/imported/Crate.png-c94a4baae7b0a5a3c18d18f9d7cd9693.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/objects/grenade.png b/assets/graphics/objects/grenade.png new file mode 100644 index 0000000..31b2201 Binary files /dev/null and b/assets/graphics/objects/grenade.png differ diff --git a/assets/graphics/objects/grenade.png.import b/assets/graphics/objects/grenade.png.import new file mode 100644 index 0000000..e3e3b56 --- /dev/null +++ b/assets/graphics/objects/grenade.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxcodns65xvhr" +path="res://.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/objects/grenade.png" +dest_files=["res://.godot/imported/grenade.png-d1c07918c8a2b35336be824628ce434f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/graphics/player/idle/Player Idle 48x48.png b/assets/graphics/player/idle/Player Idle 48x48.png index b618511..3320a73 100644 Binary files a/assets/graphics/player/idle/Player Idle 48x48.png and b/assets/graphics/player/idle/Player Idle 48x48.png differ diff --git a/assets/graphics/player/jump_fall/player jump 48x48.png b/assets/graphics/player/jump_fall/player jump 48x48.png new file mode 100644 index 0000000..dff105c Binary files /dev/null and b/assets/graphics/player/jump_fall/player jump 48x48.png differ diff --git a/assets/graphics/player/jump_fall/player jump 48x48.png.import b/assets/graphics/player/jump_fall/player jump 48x48.png.import new file mode 100644 index 0000000..c3a77f7 --- /dev/null +++ b/assets/graphics/player/jump_fall/player jump 48x48.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b524p0lnj8ftn" +path="res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/player/jump_fall/player jump 48x48.png" +dest_files=["res://.godot/imported/player jump 48x48.png-bb6ba8ccf76c9bd3765199af95f48c3c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 a788d22..30fb914 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,14 @@ run/main_scene="uid://b06dlp8n6upld" config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" +[display] + +window/size/viewport_width=1928 +window/size/viewport_height=1080 +window/size/window_width_override=1928 +window/size/window_height_override=1080 +window/stretch/mode="viewport" + [file_customization] folder_colors={