diff --git a/.DS_Store b/.DS_Store
index 71b1ae1..2325b7f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.godot/editor/bullet.tscn-editstate-6350fccf6e14d2f0c891730ee1d2c6cd.cfg b/.godot/editor/bullet.tscn-editstate-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
index 5c0add7..7fa5472 100644
--- a/.godot/editor/bullet.tscn-editstate-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
+++ b/.godot/editor/bullet.tscn-editstate-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Node2D/CollisionCheck/Sprite2D")])
+selected_nodes=Array[NodePath]([])
diff --git a/.godot/editor/bullet.tscn-folding-6350fccf6e14d2f0c891730ee1d2c6cd.cfg b/.godot/editor/bullet.tscn-folding-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
index e4191ff..33ae1d7 100644
--- a/.godot/editor/bullet.tscn-folding-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
+++ b/.godot/editor/bullet.tscn-folding-6350fccf6e14d2f0c891730ee1d2c6cd.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("physics_material_override", "Collision", "Transform", "Linear", "Solver"), NodePath("CollisionShape2D"), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("Texture", "Ordering", "Visibility", "Transform"), NodePath("TrajectoryDisplay"), PackedStringArray("Ordering")]
-resource_unfolds=["res://bullet.tscn::PhysicsMaterial_xnhwp", PackedStringArray(), "res://bullet.tscn::CircleShape2D_b5cca", PackedStringArray()]
+node_unfolds=[NodePath("."), PackedStringArray("physics_material_override", "Collision", "Transform", "Linear", "Solver"), NodePath("CollisionShape2D"), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("Texture", "Ordering", "Visibility", "Transform", "Animation", "sprite_frames"), NodePath("TrajectoryDisplay"), PackedStringArray("Ordering", "Fill", "texture")]
+resource_unfolds=["res://bullet.tscn::PhysicsMaterial_xnhwp", PackedStringArray(), "res://bullet.tscn::CircleShape2D_b5cca", PackedStringArray(), "res://bullet.tscn::SpriteFrames_pacu6", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
index aec904f..bdd22ab 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://apezoid-engine-idle.png")
+dock_filesystem_selected_paths=PackedStringArray("res://quare.tscn")
dock_filesystem_uncollapsed_paths=PackedStringArray("res://")
dock_3="Scene,Import"
dock_4="FileSystem"
@@ -27,8 +27,8 @@ dock_5="Inspector,Node,History"
[EditorNode]
-open_scenes=PackedStringArray("res://main_menu.tscn", "res://main.tscn", "res://ircle.tscn", "res://player.tscn", "res://tar.tscn", "res://player-row.tscn", "res://player-apezoid.tscn")
-current_scene="res://player-apezoid.tscn"
+open_scenes=PackedStringArray("res://main_menu.tscn", "res://main.tscn", "res://ircle.tscn", "res://exagon.tscn", "res://riangle.tscn", "res://quare.tscn")
+current_scene="res://quare.tscn"
center_split_offset=-715
selected_default_debugger_tab_idx=0
selected_main_editor_idx=2
@@ -36,8 +36,8 @@ selected_bottom_panel_item=0
[ScriptEditor]
-open_scripts=["res://Blink.gd", "res://bullet.gd", "res://CollisionCheck.gd", "res://Entagon.gd", "res://GameManager.gd", "res://Laser.gd", "res://laser_enemy.gd", "res://Leaderboard.gd", "res://LockedRotation.gd", "res://main.gd", "res://MainMenu.gd", "res://player-apezoid.gd", "res://player-row.gd", "res://player.gd", "res://riangle-tar.gd", "res://riangle.gd", "res://riangle_spawner.gd", "res://Settings.gd", "res://Shield.gd", "res://Spawner.gd", "res://tar.gd", "res://wave.gd", "res://wave_enemy.gd"]
-selected_script="res://player-apezoid.gd"
+open_scripts=["res://Blink.gd", "res://bullet.gd", "res://CollisionCheck.gd", "res://Entagon.gd", "res://GameManager.gd", "res://Laser.gd", "res://laser_enemy.gd", "res://Leaderboard.gd", "res://LockedRotation.gd", "res://main.gd", "res://MainMenu.gd", "res://player-apezoid.gd", "res://player-row.gd", "res://player.gd", "res://quare.gd", "res://riangle-tar.gd", "res://riangle.gd", "res://riangle_spawner.gd", "res://Settings.gd", "res://Shield.gd", "res://Spawner.gd", "res://tar.gd", "res://wave.gd", "res://wave_enemy.gd"]
+selected_script="res://quare.gd"
open_help=["SpriteFrames"]
script_split_offset=140
list_split_offset=0
diff --git a/.godot/editor/entagon.tscn-editstate-64b27ca157999df1d0b6655896fed044.cfg b/.godot/editor/entagon.tscn-editstate-64b27ca157999df1d0b6655896fed044.cfg
index 242f869..85d2927 100644
--- a/.godot/editor/entagon.tscn-editstate-64b27ca157999df1d0b6655896fed044.cfg
+++ b/.godot/editor/entagon.tscn-editstate-64b27ca157999df1d0b6655896fed044.cfg
@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(2, 2),
"grid_visibility": 1,
-"ofs": Vector2(-182.152, -79.4615),
+"ofs": Vector2(-117.432, -47.1272),
"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": 3.61851
+"zoom": 5.74603
}
3D={
"fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Node2D/CollisionCheck/Sprite2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Entagon/Sprite2D")])
diff --git a/.godot/editor/entagon.tscn-folding-64b27ca157999df1d0b6655896fed044.cfg b/.godot/editor/entagon.tscn-folding-64b27ca157999df1d0b6655896fed044.cfg
index 4bba2c2..7bda037 100644
--- a/.godot/editor/entagon.tscn-folding-64b27ca157999df1d0b6655896fed044.cfg
+++ b/.godot/editor/entagon.tscn-folding-64b27ca157999df1d0b6655896fed044.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("Angular", "Linear", "Solver"), NodePath("Sprite2D"), PackedStringArray("Visibility", "Transform"), NodePath("CollisionPolygon2D"), PackedStringArray("Transform")]
-resource_unfolds=["res://entagon.tscn::PhysicsMaterial_odemo", PackedStringArray()]
+node_unfolds=[NodePath("."), PackedStringArray("Angular", "Linear", "Solver"), NodePath("Sprite2D"), PackedStringArray("Visibility", "Transform", "Animation", "sprite_frames"), NodePath("CollisionPolygon2D"), PackedStringArray("Transform")]
+resource_unfolds=["res://entagon.tscn::PhysicsMaterial_odemo", PackedStringArray(), "res://entagon.tscn::SpriteFrames_v0b8u", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/exagon.tscn-editstate-6c2515107b19fa5889d20f02ee01543d.cfg b/.godot/editor/exagon.tscn-editstate-6c2515107b19fa5889d20f02ee01543d.cfg
index d434968..0a58756 100644
--- a/.godot/editor/exagon.tscn-editstate-6c2515107b19fa5889d20f02ee01543d.cfg
+++ b/.godot/editor/exagon.tscn-editstate-6c2515107b19fa5889d20f02ee01543d.cfg
@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
-"ofs": Vector2(-448.513, -307.474),
+"ofs": Vector2(-90.206, -54.7978),
"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": 1.29139
+"zoom": 7.11662
}
3D={
"fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Node2D/CollisionCheck/Sprite2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/exagon.tscn-folding-6c2515107b19fa5889d20f02ee01543d.cfg b/.godot/editor/exagon.tscn-folding-6c2515107b19fa5889d20f02ee01543d.cfg
index a565da3..78d6ae7 100644
--- a/.godot/editor/exagon.tscn-folding-6c2515107b19fa5889d20f02ee01543d.cfg
+++ b/.godot/editor/exagon.tscn-folding-6c2515107b19fa5889d20f02ee01543d.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("Shield"), PackedStringArray("Collision"), NodePath("Shield/Sprite"), PackedStringArray("Animation", "Transform", "Ordering"), NodePath("Generator/Sprite"), PackedStringArray("Transform", "Visibility"), NodePath("Generator/CollisionShape2D"), PackedStringArray("shape")]
-resource_unfolds=["res://exagon.tscn::SpriteFrames_2kvmu", PackedStringArray(), "res://exagon.tscn::CircleShape2D_evq3y", PackedStringArray()]
+node_unfolds=[NodePath("Shield"), PackedStringArray("Collision"), NodePath("Shield/Sprite"), PackedStringArray("Animation", "Transform", "Ordering", "sprite_frames", "Visibility"), NodePath("Generator/Sprite"), PackedStringArray("Transform", "Visibility"), NodePath("Generator/CollisionShape2D"), PackedStringArray("shape")]
+resource_unfolds=["res://exagon.tscn::SpriteFrames_vytjk", PackedStringArray(), "res://exagon.tscn::CircleShape2D_evq3y", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8
index 861ae31..23fb68b 100644
--- a/.godot/editor/filesystem_cache8
+++ b/.godot/editor/filesystem_cache8
@@ -1,5 +1,5 @@
-8a531afeb0b2817bc0d00c64bb8f1a30
-::res://::1715102977
+ea4bc82a6ad023ab7ee23ee620429895
+::res://::1715105995
apezoid-engine-idle.png::CompressedTexture2D::1844734805031628838::1715006313::1715006314::1::::<><>::
apezoid-gun.png::CompressedTexture2D::637761070746952016::1715005189::1715005197::1::::<><>::
apezoid_engine.png::CompressedTexture2D::3642265800163003476::1715005858::1715005861::1::::<><>::
@@ -10,7 +10,7 @@ Blink.gd::GDScript::-1::1714674759::0::1::::<>Node2D<>::
bullet-tar.tscn::PackedScene::4694596309580181587::1715003328::0::1::::<><>::uid://c6ybtahxwpukd::::res://bullet.tscn<>uid://foqvx0qb0gic::::res://tar_bullet.png
bullet.gd::GDScript::-1::1714570534::0::1::::<>RigidBody2D<>::
bullet.tscn::PackedScene::6998335245228258207::1715003328::0::1::::<><>::res://bullet.gd<>uid://ixubgtxowne7::::res://bullets.gif<>uid://djfjdlri5xdkn::::res://dotted line.png<>res://TrajectoryDisplay.gd
-bullets.gif::SpriteFrames::610207908652856204::1713485005::1713789070::1::::<><>::
+bullets.png::CompressedTexture2D::363635839898700206::1715105470::1715105470::1::::<><>::
Circle.png::CompressedTexture2D::6066999331521032293::1711497449::1713789137::1::::<><>::
Clock.gd::GDScript::-1::1714135213::0::1::::<>CharacterBody2D<>::
CollisionCheck.gd::GDScript::-1::1714747633::0::1::::<>ShapeCast2D<>::
@@ -22,12 +22,12 @@ elastic.tres::PhysicsMaterial::6918516344650059303::1713539143::0::1::::<><>::
EmojiValidator.gd::GDScript::-1::1713452349::0::1::::<>LineEdit<>::
entagon portal.png::CompressedTexture2D::4099395022402431342::1713877247::1713877249::1::::<><>::
Entagon.gd::GDScript::-1::1714570534::0::1::::<>RigidBody2D<>::
-entagon.gif::SpriteFrames::5135105654009897040::1713485005::1713789070::1::::<><>::
-entagon.tscn::PackedScene::6939239624941082470::1715003328::0::1::::<><>::res://Entagon.gd<>uid://cffqo7q1ofatc::::res://entagon.gif<>uid://djfjdlri5xdkn::::res://dotted line.png<>res://TrajectoryDisplay.gd
-entagon_enemy.tres::Resource/WaveEnemy::2373745820746730026::1715003315::0::1::::<><>::uid://c54oi61t8bvtu::::res://entagon.tscn<>uid://cfma586cg6lul::::res://entagon_ortal.tres<>res://wave_enemy.gd
-entagon_ortal.tres::SpriteFrames::5148613473701840567::1715003315::0::1::::<><>::uid://byn1o4jm6dn4y::::res://entagon portal.png
-exagon.gif::SpriteFrames::2205357881590263770::1713485005::1713789070::1::::<><>::
-exagon.tscn::PackedScene::7155377112048102897::1715003328::0::1::::<><>::uid://c5tm7od8mwjjb::::res://elastic.tres<>res://Shield.gd<>uid://comgu2t784y8f::::res://shield.png<>uid://6oj6l7lnsjhi::::res://exagon.gif<>uid://b73ik24u615jc::::res://phaserDown1.ogg
+entagon.png::CompressedTexture2D::4609919494146309067::1715105470::1715105470::1::::<><>::
+entagon.tscn::PackedScene::6939239624941082470::1715105889::0::1::::<><>::res://Entagon.gd<>uid://b6xcx23pog1hf::::res://entagon.png<>uid://djfjdlri5xdkn::::res://dotted line.png<>res://TrajectoryDisplay.gd
+entagon_enemy.tres::Resource/WaveEnemy::2373745820746730026::1715105564::0::1::::<><>::uid://c54oi61t8bvtu::::res://entagon.tscn<>uid://cfma586cg6lul::::res://entagon_ortal.tres<>res://wave_enemy.gd
+entagon_ortal.tres::SpriteFrames::5148613473701840567::1715105564::0::1::::<><>::uid://byn1o4jm6dn4y::::res://entagon portal.png
+exagon.png::CompressedTexture2D::5380697411384281519::1715105470::1715105470::1::::<><>::
+exagon.tscn::PackedScene::7155377112048102897::1715105987::0::1::::<><>::uid://c5tm7od8mwjjb::::res://elastic.tres<>res://Shield.gd<>uid://ciwpkhcp4pvqt::::res://exagon.png<>uid://b73ik24u615jc::::res://phaserDown1.ogg
explosion.png::CompressedTexture2D::1054827020943448629::1713970468::1713970535::1::::<><>::
explosion.tscn::PackedScene::5085807266017290917::1715003328::0::1::::<><>::uid://pa732bpnx3p6::::res://explosion.png<>uid://vfiu54q6ce2s::::res://explosionCrunch_004.ogg
explosionCrunch_004.ogg::AudioStreamOggVorbis::1484810678257518328::1714135213::1714135350::1::::<><>::
@@ -43,57 +43,55 @@ Hexagon.png::CompressedTexture2D::2386440034553223286::1713203512::1713789137::1
icon.svg::CompressedTexture2D::7257050209303865293::1711113563::1713789137::1::::<><>::
impactMetal_002.ogg::AudioStreamOggVorbis::8137569978207690190::1714135213::1714135350::1::::<><>::
InfiniteGradient.gd::GDScript::-1::1711370504::0::1::::<>TextureRect<>::
-ircle.gif::SpriteFrames::9181826153158668313::1713485005::1713789137::1::::<><>::
-ircle.tscn::PackedScene::2058361499628441605::1715093786::0::1::::<><>::uid://djfjdlri5xdkn::::res://dotted line.png<>res://laser_enemy.gd<>res://Laser.gd<>uid://d320lntdiw2kj::::res://ircle.gif<>uid://4ou7posn1vbd::::res://laserSmall_004.ogg
-ircle_enemy.tres::Resource/WaveEnemy::8618372424630134749::1715003315::0::1::::<><>::uid://4lc6bvf7b8a0::::res://ircle.tscn<>uid://dh2kuw87g8lsx::::res://ircle_portal.tres<>res://wave_enemy.gd
-ircle_laser.gif::AnimatedTexture::4086587679924276008::1713485005::1713789070::1::::<><>::
-ircle_portal.tres::SpriteFrames::7706966249666417231::1715003315::0::1::::<><>::uid://bsgypq0rnump0::::res://portal.png
+ircle.png::CompressedTexture2D::1097236296917638649::1715105470::1715105470::1::::<><>::
+ircle.tscn::PackedScene::2058361499628441605::1715105909::0::1::::<><>::uid://djfjdlri5xdkn::::res://dotted line.png<>res://laser_enemy.gd<>res://Laser.gd<>uid://pvrk6wkx47kn::::res://ircle.png<>uid://4ou7posn1vbd::::res://laserSmall_004.ogg
+ircle_enemy.tres::Resource/WaveEnemy::8618372424630134749::1715105564::0::1::::<><>::uid://4lc6bvf7b8a0::::res://ircle.tscn<>uid://dh2kuw87g8lsx::::res://ircle_portal.tres<>res://wave_enemy.gd
+ircle_laser.png::CompressedTexture2D::7971391314863135570::1715105470::1715105470::1::::<><>::
+ircle_portal.tres::SpriteFrames::7706966249666417231::1715105564::0::1::::<><>::uid://bsgypq0rnump0::::res://portal.png
Kenney Future.ttf::FontFile::3312491276026202750::1713542136::1713789070::1::::<><>::
laser4.ogg::AudioStreamOggVorbis::401709881904318869::1713788545::1713789137::1::::<><>::
Laser.gd::GDScript::-1::1711650584::0::1::::<>Line2D<>::
laserSmall_004.ogg::AudioStreamOggVorbis::2065650049633832153::1714135213::1714135350::1::::<><>::
-laser_enemy.gd::GDScript::-1::1714570534::0::1::::<>StaticBody2D<>::
+laser_enemy.gd::GDScript::-1::1715105695::0::1::::<>StaticBody2D<>::
laser_idle.png::CompressedTexture2D::319827999329341531::1713484083::1713789137::1::::<><>::
Leaderboard.gd::GDScript::-1::1714745513::0::1::::<>RichTextLabel<>::
Leaderborad.gd::GDScript::-1::1713210189::0::1::::<>Label<>::
loading_bg.png::CompressedTexture2D::2611156968220547840::1713883940::1713884000::1::::<><>::
LockedRotation.gd::GDScript::-1::1714673387::0::1::::<>Node2D<>::
main.gd::GDScript::-1::1715018832::0::1::::<>Node2D<>::
-main.tscn::PackedScene::3236663861408967157::1715093786::0::1::::<><>::res://main.gd<>res://Spawner.gd<>res://GameManager.gd<>uid://du12lm5aq7g7f::::res://ircle_enemy.tres<>uid://c5tm7od8mwjjb::::res://elastic.tres<>res://wave.gd<>res://Clock.gd<>uid://824inmsxuois::::res://entagon_enemy.tres<>uid://3gxjbodh4fwe::::res://riangle_enemy.tres<>uid://yvrhlh04k8w1::::res://background space.png<>res://wave_enemy.gd<>uid://cwquv3mq5kk1d::::res://countdown-spritesheet.png<>uid://dn65uapn0wsok::::res://impactMetal_002.ogg<>res://CollisionCheck.gd<>uid://bnguin7bsyx6e::::res://Kenney Future.ttf<>uid://cso5ufbf7u7oj::::res://Circle.png<>res://Notification.gd<>res://Stopwatch.gd<>res://Leaderboard.gd<>uid://4sdwatj6up8i::::res://tar.tscn<>uid://d3icnl4vjbbt7::::res://Flow State.wav
+main.tscn::PackedScene::3236663861408967157::1715105713::0::1::::<><>::res://main.gd<>res://Spawner.gd<>res://GameManager.gd<>uid://du12lm5aq7g7f::::res://ircle_enemy.tres<>uid://c5tm7od8mwjjb::::res://elastic.tres<>res://wave.gd<>res://Clock.gd<>uid://824inmsxuois::::res://entagon_enemy.tres<>uid://3gxjbodh4fwe::::res://riangle_enemy.tres<>uid://yvrhlh04k8w1::::res://background space.png<>res://wave_enemy.gd<>uid://cwquv3mq5kk1d::::res://countdown-spritesheet.png<>uid://dn65uapn0wsok::::res://impactMetal_002.ogg<>res://CollisionCheck.gd<>uid://bnguin7bsyx6e::::res://Kenney Future.ttf<>uid://cso5ufbf7u7oj::::res://Circle.png<>res://Notification.gd<>res://Stopwatch.gd<>res://Leaderboard.gd<>uid://4sdwatj6up8i::::res://tar.tscn<>uid://d3icnl4vjbbt7::::res://Flow State.wav
MainMenu.gd::GDScript::-1::1714052978::0::1::::<>Control<>::
main_menu.png::CompressedTexture2D::2780089184658583639::1713788545::1713789137::1::::<><>::
-main_menu.tscn::PackedScene::5528589196531596798::1715093786::0::1::::<><>::res://MainMenu.gd<>uid://bfuxwsctqat2v::::res://main_menu.png<>uid://bnguin7bsyx6e::::res://Kenney Future.ttf<>res://Settings.gd<>uid://bdg4mycyxr8hw::::res://loading_bg.png<>res://EmojiValidator.gd
+main_menu.tscn::PackedScene::5528589196531596798::1715105713::0::1::::<><>::res://MainMenu.gd<>uid://bfuxwsctqat2v::::res://main_menu.png<>uid://bnguin7bsyx6e::::res://Kenney Future.ttf<>res://Settings.gd<>uid://bdg4mycyxr8hw::::res://loading_bg.png<>res://EmojiValidator.gd
Notification.gd::GDScript::-1::1712255812::0::1::::<>Label<>::
Pentagon.png::CompressedTexture2D::2016652846434182215::1713279500::1713789137::1::::<><>::
phaserDown1.ogg::AudioStreamOggVorbis::4690771314985965484::1713788545::1713789137::1::::<><>::
PinnedLine.gd::GDScript::-1::1711545334::0::1::::<>Line2D<>::
PinnedNode.gd::GDScript::-1::1711548006::0::1::::<>Node2D<>::
-player-apezoid.gd::GDScript::-1::1715020932::0::1::::<>RigidBody2D<>::
-player-apezoid.tscn::PackedScene::6156797845938407896::1715093786::0::1::::<><>::uid://cgcjicue76wsr::::res://player.tscn<>res://player-apezoid.gd<>uid://jc63jnpm7inw::::res://apezoid-gun.png<>uid://br5lt5658ioy3::::res://apezoid_engine.png<>uid://1jurox63577w::::res://apezoid-engine-idle.png<>uid://djfjdlri5xdkn::::res://dotted line.png<>res://Laser.gd<>uid://4ou7posn1vbd::::res://laserSmall_004.ogg
-player-row.gd::GDScript::-1::1715005514::0::1::::<>RigidBody2D<>::
-player-row.tscn::PackedScene::2745587543146493526::1715093786::0::1::::<><>::uid://cgcjicue76wsr::::res://player.tscn<>uid://cmkptgd3k37bl::::res://player_idle.gif<>res://player-row.gd<>uid://cbghiy80qmaa0::::res://powerUp6.ogg<>uid://mond5sdmukan::::res://powerUp7.ogg
+player-apezoid.gd::GDScript::-1::1715105709::0::1::::<>RigidBody2D<>::
+player-apezoid.tscn::PackedScene::6156797845938407896::1715105713::0::1::::<><>::uid://cgcjicue76wsr::::res://player.tscn<>res://player-apezoid.gd<>uid://jc63jnpm7inw::::res://apezoid-gun.png<>uid://br5lt5658ioy3::::res://apezoid_engine.png<>uid://1jurox63577w::::res://apezoid-engine-idle.png<>uid://djfjdlri5xdkn::::res://dotted line.png<>res://Laser.gd<>uid://4ou7posn1vbd::::res://laserSmall_004.ogg
+player-row.gd::GDScript::-1::1715105564::0::1::::<>RigidBody2D<>::
+player-row.tscn::PackedScene::2745587543146493526::1715105713::0::1::::<><>::uid://cgcjicue76wsr::::res://player.tscn<>res://player-row.gd<>uid://cbghiy80qmaa0::::res://powerUp6.ogg<>uid://bd0inrlfuocmv::::res://player_idle.png<>uid://mond5sdmukan::::res://powerUp7.ogg<>uid://uy21l35yd3p5::::res://player_moving.png
player.gd::GDScript::-1::1715008951::0::1::::<>RigidBody2D<>::
-player.tscn::PackedScene::5198664060177190853::1715093786::0::1::::<><>::res://player.gd<>uid://cuu1qqskoqabg::::res://Taco_Bell_Bong.ogg
-player_idle.gif::SpriteFrames::5636696274620085357::1713485005::1713789070::1::::<><>::
-player_moving.gif::SpriteFrames::7222775645094374534::1713485005::1713789070::1::::<><>::
-portal-mask.gif::SpriteFrames::2920232568348411467::1713485005::1713789070::1::::<><>::
-portal-sprite.gif::SpriteFrames::5072548492707339323::1713485005::1713789137::1::::<><>::
+player.tscn::PackedScene::5198664060177190853::1715105713::0::1::::<><>::res://player.gd<>uid://cuu1qqskoqabg::::res://Taco_Bell_Bong.ogg
+player_idle.png::CompressedTexture2D::2649106519865845829::1715105470::1715105470::1::::<><>::
+player_moving.png::CompressedTexture2D::1455008350710964964::1715105470::1715105470::1::::<><>::
portal.png::CompressedTexture2D::3663691010221298967::1713788545::1713789137::1::::<><>::
portal.tscn::PackedScene::5293022776512159918::1713788545::0::1::::<><>::uid://dh2kuw87g8lsx::::res://ircle_portal.tres
powerUp6.ogg::AudioStreamOggVorbis::4855857095545885401::1713788545::1713789137::1::::<><>::
powerUp7.ogg::AudioStreamOggVorbis::871963694161027957::1713788545::1713789137::1::::<><>::
+quare 2.png::CompressedTexture2D::2443316521774652954::1715105470::1715105470::1::::<><>::
quare.gd::GDScript::-1::1713970918::0::1::::<>StaticBody2D<>::
-quare.gif::SpriteFrames::3147531847542783553::1713485005::1713789070::1::::<><>::
-quare.tscn::PackedScene::127098807235726851::1713485005::0::1::::<><>::uid://c5tm7od8mwjjb::::res://elastic.tres<>res://quare.gd<>res://LockedRotation.gd<>uid://bk3xnipssntsj::::res://quare.gif
+quare.tscn::PackedScene::127098807235726851::1715105832::0::1::::<><>::uid://c5tm7od8mwjjb::::res://elastic.tres<>res://quare.gd<>res://LockedRotation.gd<>uid://ba2tcipuc8rdi::::res://quare 2.png
riangle-portal.png::CompressedTexture2D::3857796396327445076::1713788545::1713789137::1::::<><>::
riangle-tar.gd::GDScript::-1::1714675305::0::1::::<>RigidBody2D<>::
riangle-tar.png::CompressedTexture2D::6944178498998703172::1714137229::1714047925::1::::<><>::
riangle-tar.tscn::PackedScene::865079692092099546::1715003328::0::1::::<><>::res://riangle-tar.gd<>uid://c562ut0sxn6we::::res://riangle-tar.png<>res://Blink.gd<>uid://yq2flqkxnw7u::::res://dotted circle.png
riangle.gd::GDScript::-1::1714570534::0::1::::<>PhysicsBody2D<>::
-riangle.gif::SpriteFrames::8550787403464072338::1713485005::1713789070::1::::<><>::
+riangle.png::CompressedTexture2D::8070558177925267668::1715105470::1715105470::1::::<><>::
riangle.tscn::PackedScene::1727686414539841705::1715003328::0::1::::<><>::uid://dt3chppm3qub7::::res://riangle.gif<>res://riangle.gd<>res://Gun.gd<>uid://c6ybtahxwpukd::::res://bullet.tscn
-riangle_enemy.tres::Resource/WaveEnemy::1979086525665457084::1715003315::0::1::::<><>::uid://yu50iyftoyaj::::res://riangle.tscn<>uid://tu8xwjkn0wrj::::res://riangle_portal.tres<>res://wave_enemy.gd
-riangle_portal.tres::SpriteFrames::1376921488114594875::1715003315::0::1::::<><>::uid://bu70lwr6f3igy::::res://riangle-portal.png
+riangle_enemy.tres::Resource/WaveEnemy::1979086525665457084::1715105564::0::1::::<><>::uid://yu50iyftoyaj::::res://riangle.tscn<>uid://tu8xwjkn0wrj::::res://riangle_portal.tres<>res://wave_enemy.gd
+riangle_portal.tres::SpriteFrames::1376921488114594875::1715105564::0::1::::<><>::uid://bu70lwr6f3igy::::res://riangle-portal.png
riangle_spawner.gd::GDScript::-1::1714570534::0::1::::<>Node2D<>::
ScreenPosCamera.gd::GDScript::-1::1711391974::0::1::::<>Camera2D<>::
Settings.gd::GDScript::-1::1715020473::0::1::::<>Node<>::
@@ -105,7 +103,7 @@ Taco_Bell_Bong.ogg::AudioStreamOggVorbis::6219513878396225352::1713788545::17137
tar phase 2.png::CompressedTexture2D::8835619070722889434::1714401231::1714401232::1::::<><>::
tar transform.png::CompressedTexture2D::6394947411145313539::1714401149::1714401153::1::::<><>::
tar.gd::GDScript::-1::1714674324::0::1::::<>RigidBody2D<>::
-tar.tscn::PackedScene::2072856733322655894::1715093786::0::1::::<><>::res://tar.gd<>uid://d4cjh2d7wxdyp::::res://tar_body.png<>res://riangle_spawner.gd<>uid://dx5bmcutp8qu1::::res://tar phase 2.png<>uid://cxd035cvwa22b::::res://tar transform.png
+tar.tscn::PackedScene::2072856733322655894::1715105713::0::1::::<><>::res://tar.gd<>uid://d4cjh2d7wxdyp::::res://tar_body.png<>res://riangle_spawner.gd<>uid://dx5bmcutp8qu1::::res://tar phase 2.png<>uid://cxd035cvwa22b::::res://tar transform.png
tar_body.png::CompressedTexture2D::9199427649831702691::1713983894::1713983896::1::::<><>::
tar_bullet.png::CompressedTexture2D::380855727689721666::1714140992::1714140993::1::::<><>::
TextCollision.gd::GDScript::-1::1713191644::0::1::::<>CollisionShape2D<>::
@@ -124,10 +122,3 @@ index.apple-touch-icon.png::CompressedTexture2D::8318282097538809781::1715087841
index.icon.png::CompressedTexture2D::2272868494679374172::1715087841::1715090990::1::::<><>::
index.manifest.json::JSON::-1::1715087841::0::1::::<><>::
index.png::CompressedTexture2D::8121917289960212038::1715087841::1715090990::1::::<><>::
-::res://godotgif/::1715094228
-godotgif.gdextension::GDExtension::-1::1715094228::0::1::::<><>::
-LICENSE.txt::TextFile::-1::1715094228::0::1::::<><>::
-README.md::TextFile::-1::1715094228::0::1::::<><>::
-::res://godotgif/bin/::1715094228
-::res://godotgif/bin/godotgif.macos.template_debug.framework/::1715094228
-::res://godotgif/bin/godotgif.macos.template_release.framework/::1715094228
diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4
index d4c3da7..d66487a 100644
--- a/.godot/editor/filesystem_update4
+++ b/.godot/editor/filesystem_update4
@@ -1,13 +1,15 @@
-res://main_menu.tscn
+res://bullet.tscn
res://ircle_portal.tres
res://ircle_enemy.tres
res://entagon_ortal.tres
res://entagon_enemy.tres
res://riangle_portal.tres
res://riangle_enemy.tres
+res://laser_enemy.gd
+res://exagon.tscn
+res://main_menu.tscn
res://main.tscn
res://ircle.tscn
-res://player.tscn
-res://tar.tscn
-res://player-row.tscn
-res://player-apezoid.tscn
+res://riangle.tscn
+res://quare.gd
+res://quare.tscn
diff --git a/.godot/editor/ircle.tscn-editstate-a484672f393ca4306fb610d990a1b8dd.cfg b/.godot/editor/ircle.tscn-editstate-a484672f393ca4306fb610d990a1b8dd.cfg
index 48025bf..7f56af3 100644
--- a/.godot/editor/ircle.tscn-editstate-a484672f393ca4306fb610d990a1b8dd.cfg
+++ b/.godot/editor/ircle.tscn-editstate-a484672f393ca4306fb610d990a1b8dd.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/ircle.tscn-folding-a484672f393ca4306fb610d990a1b8dd.cfg b/.godot/editor/ircle.tscn-folding-a484672f393ca4306fb610d990a1b8dd.cfg
index 6dfe5c2..8005cac 100644
--- a/.godot/editor/ircle.tscn-folding-a484672f393ca4306fb610d990a1b8dd.cfg
+++ b/.godot/editor/ircle.tscn-folding-a484672f393ca4306fb610d990a1b8dd.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("Line2D"), PackedStringArray("points", "Fill", "Ordering", "Capping"), NodePath("Sprite2D"), PackedStringArray("Visibility", "Region", "Transform"), NodePath("CollisionShape2D"), PackedStringArray("shape")]
-resource_unfolds=["res://ircle.tscn::CircleShape2D_yns8h", PackedStringArray()]
+node_unfolds=[NodePath("."), PackedStringArray("Collision"), NodePath("Line2D"), PackedStringArray("points", "Fill", "Ordering", "Capping"), NodePath("Sprite2D"), PackedStringArray("Visibility", "Region", "Transform", "Animation", "sprite_frames"), NodePath("CollisionShape2D"), PackedStringArray("shape")]
+resource_unfolds=["res://ircle.tscn::SpriteFrames_s64kc", PackedStringArray(), "res://ircle.tscn::CircleShape2D_yns8h", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
index 6cfdb61..04eaa93 100644
--- a/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
+++ b/.godot/editor/main.tscn-editstate-3070c538c03ee49b7677ff960a3f5195.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/main_menu.tscn-editstate-8b03550a1e82db90fe95208a9e9dbb82.cfg b/.godot/editor/main_menu.tscn-editstate-8b03550a1e82db90fe95208a9e9dbb82.cfg
index b2e7e1f..979c290 100644
--- a/.godot/editor/main_menu.tscn-editstate-8b03550a1e82db90fe95208a9e9dbb82.cfg
+++ b/.godot/editor/main_menu.tscn-editstate-8b03550a1e82db90fe95208a9e9dbb82.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/player-apezoid.tscn-editstate-83ac778ddeab5dcdee16ef557d22d6e2.cfg b/.godot/editor/player-apezoid.tscn-editstate-83ac778ddeab5dcdee16ef557d22d6e2.cfg
index d06402e..82be2f3 100644
--- a/.godot/editor/player-apezoid.tscn-editstate-83ac778ddeab5dcdee16ef557d22d6e2.cfg
+++ b/.godot/editor/player-apezoid.tscn-editstate-83ac778ddeab5dcdee16ef557d22d6e2.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Ircle/Sprite2D")])
diff --git a/.godot/editor/player-row.tscn-editstate-a3eceb3b11622fb4cec11e1705ddd740.cfg b/.godot/editor/player-row.tscn-editstate-a3eceb3b11622fb4cec11e1705ddd740.cfg
index 7fe72a2..3b635f8 100644
--- a/.godot/editor/player-row.tscn-editstate-a3eceb3b11622fb4cec11e1705ddd740.cfg
+++ b/.godot/editor/player-row.tscn-editstate-a3eceb3b11622fb4cec11e1705ddd740.cfg
@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(2, 2),
"grid_visibility": 1,
-"ofs": Vector2(-239.802, -39.669),
+"ofs": Vector2(-179.669, -36.951),
"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": 2.52855
+"zoom": 4.869
}
3D={
"fov": 70.01,
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Ircle/Sprite2D")])
diff --git a/.godot/editor/player-row.tscn-folding-a3eceb3b11622fb4cec11e1705ddd740.cfg b/.godot/editor/player-row.tscn-folding-a3eceb3b11622fb4cec11e1705ddd740.cfg
index 3ff0c3d..074ba18 100644
--- a/.godot/editor/player-row.tscn-folding-a3eceb3b11622fb4cec11e1705ddd740.cfg
+++ b/.godot/editor/player-row.tscn-folding-a3eceb3b11622fb4cec11e1705ddd740.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("Transform", "Linear", "Solver", "Collision")]
-resource_unfolds=["res://player-row.tscn::CircleShape2D_caugh", PackedStringArray()]
+node_unfolds=[NodePath("."), PackedStringArray("Transform", "Linear", "Solver", "Collision"), NodePath("AnimatedSprite2D"), PackedStringArray("Animation", "sprite_frames")]
+resource_unfolds=["res://player-row.tscn::SpriteFrames_1rjkk", PackedStringArray(), "res://player-row.tscn::CircleShape2D_caugh", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/player.tscn-editstate-36a25e342948d0ceacc500772b5412b3.cfg b/.godot/editor/player.tscn-editstate-36a25e342948d0ceacc500772b5412b3.cfg
index 7fe72a2..aed382c 100644
--- a/.godot/editor/player.tscn-editstate-36a25e342948d0ceacc500772b5412b3.cfg
+++ b/.godot/editor/player.tscn-editstate-36a25e342948d0ceacc500772b5412b3.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Ircle/Sprite2D")])
diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg
index 075b668..afdb1d3 100644
--- a/.godot/editor/project_metadata.cfg
+++ b/.godot/editor/project_metadata.cfg
@@ -60,8 +60,8 @@ recent_presets=PackedColorArray(1, 1, 1, 0.313726, 1, 1, 1, 0.596078, 1, 1, 1, 0
[recent_files]
-scenes=["res://player-apezoid.tscn", "res://player-row.tscn", "res://tar.tscn", "res://player.tscn", "res://ircle.tscn", "res://main.tscn", "res://main_menu.tscn", "res://exagon.tscn", "res://bullet-tar.tscn", "res://riangle-tar.tscn"]
-scripts=["SpriteFrames", "res://main.gd", "res://Settings.gd", "res://Laser.gd", "res://player-apezoid.gd", "res://player.gd", "res://Blink.gd", "res://wave.gd", "res://CollisionCheck.gd", "res://player-row.gd"]
+scenes=["res://quare.tscn", "res://riangle.tscn", "res://bullet.tscn", "res://exagon.tscn", "res://ircle.tscn", "res://main.tscn", "res://main_menu.tscn", "res://entagon.tscn", "res://player-row.tscn", "res://player-apezoid.tscn"]
+scripts=["SpriteFrames", "res://quare.gd", "res://main.gd", "res://Settings.gd", "res://Laser.gd", "res://player-apezoid.gd", "res://player.gd", "res://Blink.gd", "res://wave.gd", "res://CollisionCheck.gd"]
[script_setup]
diff --git a/.godot/editor/quare.tscn-editstate-ffbe1221c530077e199941e0e4836676.cfg b/.godot/editor/quare.tscn-editstate-ffbe1221c530077e199941e0e4836676.cfg
index 64a4cf9..980bc6f 100644
--- a/.godot/editor/quare.tscn-editstate-ffbe1221c530077e199941e0e4836676.cfg
+++ b/.godot/editor/quare.tscn-editstate-ffbe1221c530077e199941e0e4836676.cfg
@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
-"ofs": Vector2(-100.68, -49.2296),
+"ofs": Vector2(-101.91, -63.2672),
"primary_grid_step": Vector2i(8, 8),
"show_edit_locks": true,
"show_guides": true,
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/quare.tscn-folding-ffbe1221c530077e199941e0e4836676.cfg b/.godot/editor/quare.tscn-folding-ffbe1221c530077e199941e0e4836676.cfg
index c5117b6..5c370a1 100644
--- a/.godot/editor/quare.tscn-folding-ffbe1221c530077e199941e0e4836676.cfg
+++ b/.godot/editor/quare.tscn-folding-ffbe1221c530077e199941e0e4836676.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("AnimatedSprite"), PackedStringArray("Animation", "Visibility", "sprite_frames"), NodePath("CollisionShape2D"), PackedStringArray("shape")]
-resource_unfolds=["res://quare.tscn::RectangleShape2D_e1p40", PackedStringArray()]
+node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("AnimatedSprite"), PackedStringArray("Animation", "Visibility", "sprite_frames", "Transform"), NodePath("CollisionShape2D"), PackedStringArray("shape")]
+resource_unfolds=["res://quare.tscn::SpriteFrames_mpdcb", PackedStringArray(), "res://quare.tscn::RectangleShape2D_e1p40", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/recent_dirs b/.godot/editor/recent_dirs
index 3ab9346..67d0c66 100644
--- a/.godot/editor/recent_dirs
+++ b/.godot/editor/recent_dirs
@@ -1,4 +1,4 @@
-/Users/ultrablob/Documents/Godot Projects/Build
res://
+/Users/ultrablob/Documents/Godot Projects/Build
/Users/ultrablob/Documents/Godot Projects/Countdown/
/Users/ultrablob/Documents/Godot Projects
diff --git a/.godot/editor/riangle.tscn-editstate-6b2f868e409afccd4c50d18e8f1aa4c0.cfg b/.godot/editor/riangle.tscn-editstate-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
index 8559874..c60ef3e 100644
--- a/.godot/editor/riangle.tscn-editstate-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
+++ b/.godot/editor/riangle.tscn-editstate-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
@@ -8,7 +8,7 @@ Anim={
"grid_snap_active": false,
"grid_step": Vector2(8, 8),
"grid_visibility": 1,
-"ofs": Vector2(-144.409, 15.7132),
+"ofs": Vector2(-152.028, -35.8277),
"primary_grid_step": Vector2i(8, 8),
"show_edit_locks": true,
"show_guides": true,
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Node2D/CollisionCheck/Sprite2D")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Quare/AnimatedSprite")])
diff --git a/.godot/editor/riangle.tscn-folding-6b2f868e409afccd4c50d18e8f1aa4c0.cfg b/.godot/editor/riangle.tscn-folding-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
index c71fbea..184e1e4 100644
--- a/.godot/editor/riangle.tscn-folding-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
+++ b/.godot/editor/riangle.tscn-folding-6b2f868e409afccd4c50d18e8f1aa4c0.cfg
@@ -1,5 +1,5 @@
[folding]
-node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("Transform", "Visibility"), NodePath("Gun2"), PackedStringArray("Transform"), NodePath("Gun3"), PackedStringArray("Transform")]
-resource_unfolds=[]
+node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("Sprite2D"), PackedStringArray("Transform", "Visibility", "Animation", "sprite_frames"), NodePath("Gun2"), PackedStringArray("Transform"), NodePath("Gun3"), PackedStringArray("Transform")]
+resource_unfolds=["res://riangle.tscn::SpriteFrames_p5dvv", PackedStringArray()]
nodes_folded=[]
diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg
index 63e2a0d..ab9db50 100644
--- a/.godot/editor/script_editor_cache.cfg
+++ b/.godot/editor/script_editor_cache.cfg
@@ -91,16 +91,12 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 0,
+"column": 52,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 57,
-"scroll_position": 25.0,
-"selection": true,
-"selection_from_column": 0,
-"selection_from_line": 57,
-"selection_to_column": 14,
-"selection_to_line": 58,
+"row": 4,
+"scroll_position": 4.0,
+"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -235,16 +231,12 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 0,
+"column": 20,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 7,
+"row": 0,
"scroll_position": 0.0,
-"selection": true,
-"selection_from_column": 0,
-"selection_from_line": 7,
-"selection_to_column": 44,
-"selection_to_line": 10,
+"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -547,11 +539,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 29,
+"column": 32,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 9,
-"scroll_position": 13.0,
+"row": 6,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -589,11 +581,11 @@ state={
state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
-"column": 22,
+"column": 51,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 19,
-"scroll_position": 14.0,
+"row": 7,
+"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
@@ -606,7 +598,7 @@ state={
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
-"row": 9,
+"row": 6,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
diff --git a/.godot/editor/tar.tscn-editstate-fd2ac022ba481e40ae1e12c92f635071.cfg b/.godot/editor/tar.tscn-editstate-fd2ac022ba481e40ae1e12c92f635071.cfg
index ea0661c..7376fce 100644
--- a/.godot/editor/tar.tscn-editstate-fd2ac022ba481e40ae1e12c92f635071.cfg
+++ b/.godot/editor/tar.tscn-editstate-fd2ac022ba481e40ae1e12c92f635071.cfg
@@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17145/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Player")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17143/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9465/@VSplitContainer@9284/@HSplitContainer@9286/@HSplitContainer@9288/@Control@9289/@SubViewportContainer@9290/@SubViewport@9291/Ircle/Sprite2D")])
diff --git a/.godot/extension_list.cfg b/.godot/extension_list.cfg
deleted file mode 100644
index 3564f97..0000000
--- a/.godot/extension_list.cfg
+++ /dev/null
@@ -1 +0,0 @@
-res://godotgif/godotgif.gdextension
diff --git a/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.ctex b/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.ctex
new file mode 100644
index 0000000..73a402a
Binary files /dev/null and b/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.ctex differ
diff --git a/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.md5 b/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.md5
new file mode 100644
index 0000000..b4f89f4
--- /dev/null
+++ b/.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.md5
@@ -0,0 +1,3 @@
+source_md5="292d13389c0c118cb3cea7294d2eb611"
+dest_md5="8f45f3d5cd901244baa968d85240a835"
+
diff --git a/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.ctex b/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.ctex
new file mode 100644
index 0000000..cdc0069
Binary files /dev/null and b/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.ctex differ
diff --git a/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.md5 b/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.md5
new file mode 100644
index 0000000..f0c3365
--- /dev/null
+++ b/.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.md5
@@ -0,0 +1,3 @@
+source_md5="939a89d1dae8b870156ffca6cbbdd49c"
+dest_md5="b93c6d3a853deac5e9b26c491479af6a"
+
diff --git a/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.ctex b/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.ctex
new file mode 100644
index 0000000..08831d3
Binary files /dev/null and b/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.ctex differ
diff --git a/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.md5 b/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.md5
new file mode 100644
index 0000000..ba3a0a2
--- /dev/null
+++ b/.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.md5
@@ -0,0 +1,3 @@
+source_md5="5a0ed55e970a5c6ed4957dd3b27e31c4"
+dest_md5="ae58d85ac260d4a40f0b7f9a6d9bb478"
+
diff --git a/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.ctex b/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.ctex
new file mode 100644
index 0000000..3fcb493
Binary files /dev/null and b/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.ctex differ
diff --git a/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.md5 b/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.md5
new file mode 100644
index 0000000..5e53f5d
--- /dev/null
+++ b/.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.md5
@@ -0,0 +1,3 @@
+source_md5="bbaa62d0aae04acbe4563e1e5b52a375"
+dest_md5="0d8eab3f5734166114e51acaad4ea5f2"
+
diff --git a/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.ctex b/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.ctex
new file mode 100644
index 0000000..27b1080
Binary files /dev/null and b/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.ctex differ
diff --git a/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.md5 b/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.md5
new file mode 100644
index 0000000..adb25a4
--- /dev/null
+++ b/.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.md5
@@ -0,0 +1,3 @@
+source_md5="9b6c2f1242c119771bdb93c25ddee409"
+dest_md5="61972616396e3ca476728a0536582837"
+
diff --git a/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.ctex b/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.ctex
new file mode 100644
index 0000000..30c5fdf
Binary files /dev/null and b/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.ctex differ
diff --git a/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.md5 b/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.md5
new file mode 100644
index 0000000..f176386
--- /dev/null
+++ b/.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.md5
@@ -0,0 +1,3 @@
+source_md5="802e4054c177848e686302342e8b14b2"
+dest_md5="ed500b8e0a2461306b506e01fe33e472"
+
diff --git a/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.ctex b/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.ctex
new file mode 100644
index 0000000..02c964b
Binary files /dev/null and b/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.ctex differ
diff --git a/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.md5 b/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.md5
new file mode 100644
index 0000000..3f25251
--- /dev/null
+++ b/.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.md5
@@ -0,0 +1,3 @@
+source_md5="ce7612743adebae8830d883cf5ad3055"
+dest_md5="a1a9bcddff5bdc4fa76fa455353a859e"
+
diff --git a/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.ctex b/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.ctex
new file mode 100644
index 0000000..4103762
Binary files /dev/null and b/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.ctex differ
diff --git a/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.md5 b/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.md5
new file mode 100644
index 0000000..a2c80cb
--- /dev/null
+++ b/.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.md5
@@ -0,0 +1,3 @@
+source_md5="939d50805773afb76f830d3feb1892d2"
+dest_md5="d910d2d27a7a56d40204377a8b5d91db"
+
diff --git a/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.ctex b/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.ctex
new file mode 100644
index 0000000..bb9f03a
Binary files /dev/null and b/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.ctex differ
diff --git a/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.md5 b/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.md5
new file mode 100644
index 0000000..e2fc1ac
--- /dev/null
+++ b/.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.md5
@@ -0,0 +1,3 @@
+source_md5="3dd4d5aa92d9707bd254cdd9f42379c5"
+dest_md5="564988a32f96e0289149b5ead6f5ebd8"
+
diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin
index ca2070d..a4b7652 100644
Binary files a/.godot/uid_cache.bin and b/.godot/uid_cache.bin differ
diff --git a/bullet.tscn b/bullet.tscn
index e771281..35993b2 100644
--- a/bullet.tscn
+++ b/bullet.tscn
@@ -1,7 +1,7 @@
-[gd_scene load_steps=7 format=3 uid="uid://c6ybtahxwpukd"]
+[gd_scene load_steps=12 format=3 uid="uid://c6ybtahxwpukd"]
[ext_resource type="Script" path="res://bullet.gd" id="1_3q13i"]
-[ext_resource type="SpriteFrames" uid="uid://ixubgtxowne7" path="res://bullets.gif" id="2_iifjj"]
+[ext_resource type="Texture2D" uid="uid://fgfa8x6icumw" path="res://bullets.png" id="2_unua3"]
[ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="4_h1jno"]
[ext_resource type="Script" path="res://TrajectoryDisplay.gd" id="5_0jcwc"]
@@ -12,6 +12,42 @@ bounce = 1.0
[sub_resource type="CircleShape2D" id="CircleShape2D_b5cca"]
radius = 13.0
+[sub_resource type="AtlasTexture" id="AtlasTexture_8myh4"]
+atlas = ExtResource("2_unua3")
+region = Rect2(0, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ldqff"]
+atlas = ExtResource("2_unua3")
+region = Rect2(40, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_u3ov1"]
+atlas = ExtResource("2_unua3")
+region = Rect2(80, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ia1sw"]
+atlas = ExtResource("2_unua3")
+region = Rect2(120, 0, 40, 40)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_pacu6"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8myh4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ldqff")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_u3ov1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ia1sw")
+}],
+"loop": true,
+"name": &"default",
+"speed": 7.0
+}]
+
[node name="Bullet" type="RigidBody2D" groups=["bullet"]]
collision_layer = 2
physics_material_override = SubResource("PhysicsMaterial_xnhwp")
@@ -30,9 +66,8 @@ texture_filter = 1
position = Vector2(-0.0234375, -0.00781251)
rotation = 1.5708
scale = Vector2(4, 4)
-sprite_frames = ExtResource("2_iifjj")
-animation = &"gif"
-autoplay = "gif"
+sprite_frames = SubResource("SpriteFrames_pacu6")
+autoplay = "default"
offset = Vector2(7.05637, 10.7826)
[node name="TrajectoryDisplay" type="Line2D" parent="."]
diff --git a/bullets.gif b/bullets.gif
deleted file mode 100644
index 51e196f..0000000
Binary files a/bullets.gif and /dev/null differ
diff --git a/bullets.gif.import b/bullets.gif.import
deleted file mode 100644
index 1412fdf..0000000
--- a/bullets.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://ixubgtxowne7"
-path="res://.godot/imported/bullets.gif-cf28b24fb52f27f7a7bcad8d703a68d8.tres"
-
-[deps]
-
-source_file="res://bullets.gif"
-dest_files=["res://.godot/imported/bullets.gif-cf28b24fb52f27f7a7bcad8d703a68d8.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/bullets.png b/bullets.png
new file mode 100644
index 0000000..b922833
Binary files /dev/null and b/bullets.png differ
diff --git a/bullets.png.import b/bullets.png.import
new file mode 100644
index 0000000..982031a
--- /dev/null
+++ b/bullets.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://fgfa8x6icumw"
+path="res://.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://bullets.png"
+dest_files=["res://.godot/imported/bullets.png-b55fd14939aefaa0440cc9a2d353680d.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/entagon.gif b/entagon.gif
deleted file mode 100644
index 4eed684..0000000
Binary files a/entagon.gif and /dev/null differ
diff --git a/entagon.gif.import b/entagon.gif.import
deleted file mode 100644
index be61aaf..0000000
--- a/entagon.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://cffqo7q1ofatc"
-path="res://.godot/imported/entagon.gif-4b3662f98a98e595bbebac7629871e53.tres"
-
-[deps]
-
-source_file="res://entagon.gif"
-dest_files=["res://.godot/imported/entagon.gif-4b3662f98a98e595bbebac7629871e53.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/entagon.png b/entagon.png
new file mode 100644
index 0000000..a9e877d
Binary files /dev/null and b/entagon.png differ
diff --git a/entagon.png.import b/entagon.png.import
new file mode 100644
index 0000000..a2459e5
--- /dev/null
+++ b/entagon.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b6xcx23pog1hf"
+path="res://.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://entagon.png"
+dest_files=["res://.godot/imported/entagon.png-aa37a1e4899efaf3640810e474ec00c8.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/entagon.tscn b/entagon.tscn
index 07f5340..63cd864 100644
--- a/entagon.tscn
+++ b/entagon.tscn
@@ -1,13 +1,63 @@
-[gd_scene load_steps=6 format=3 uid="uid://c54oi61t8bvtu"]
+[gd_scene load_steps=13 format=3 uid="uid://c54oi61t8bvtu"]
[ext_resource type="Script" path="res://Entagon.gd" id="1_726g8"]
-[ext_resource type="SpriteFrames" uid="uid://cffqo7q1ofatc" path="res://entagon.gif" id="3_116st"]
+[ext_resource type="Texture2D" uid="uid://b6xcx23pog1hf" path="res://entagon.png" id="2_vqlca"]
[ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="4_vixiu"]
[ext_resource type="Script" path="res://TrajectoryDisplay.gd" id="5_w6b4q"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_odemo"]
bounce = 1.0
+[sub_resource type="AtlasTexture" id="AtlasTexture_na0t5"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(0, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kvsdg"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(64, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7iwp2"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(128, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_euoju"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(192, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rpqlb"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(256, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_t7qac"]
+atlas = ExtResource("2_vqlca")
+region = Rect2(0, 64, 64, 64)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_v0b8u"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_na0t5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kvsdg")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7iwp2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_euoju")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rpqlb")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_t7qac")
+}],
+"loop": true,
+"name": &"default",
+"speed": 10.0
+}]
+
[node name="Entagon" type="RigidBody2D" groups=["enemy"]]
physics_material_override = SubResource("PhysicsMaterial_odemo")
gravity_scale = 1.66533e-16
@@ -21,9 +71,10 @@ script = ExtResource("1_726g8")
texture_filter = 1
position = Vector2(-0.999999, 0.999999)
scale = Vector2(0.90625, 0.90625)
-sprite_frames = ExtResource("3_116st")
-animation = &"gif"
-autoplay = "gif"
+sprite_frames = SubResource("SpriteFrames_v0b8u")
+autoplay = "default"
+frame = 5
+frame_progress = 0.0888797
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
scale = Vector2(0.1, 0.1)
diff --git a/exagon.gif b/exagon.gif
deleted file mode 100644
index 712d698..0000000
Binary files a/exagon.gif and /dev/null differ
diff --git a/exagon.gif.import b/exagon.gif.import
deleted file mode 100644
index e1a81ce..0000000
--- a/exagon.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://6oj6l7lnsjhi"
-path="res://.godot/imported/exagon.gif-656773424f085c6c02f4df86494098c6.tres"
-
-[deps]
-
-source_file="res://exagon.gif"
-dest_files=["res://.godot/imported/exagon.gif-656773424f085c6c02f4df86494098c6.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/exagon.png b/exagon.png
new file mode 100644
index 0000000..31b46b1
Binary files /dev/null and b/exagon.png differ
diff --git a/exagon.png.import b/exagon.png.import
new file mode 100644
index 0000000..7ae35fd
--- /dev/null
+++ b/exagon.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ciwpkhcp4pvqt"
+path="res://.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://exagon.png"
+dest_files=["res://.godot/imported/exagon.png-4fddc26667fa29810fdf1e64575ca3b5.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/exagon.tscn b/exagon.tscn
index 62d94da..f416562 100644
--- a/exagon.tscn
+++ b/exagon.tscn
@@ -1,80 +1,37 @@
-[gd_scene load_steps=17 format=3 uid="uid://c87easb8570vd"]
+[gd_scene load_steps=10 format=3 uid="uid://c87easb8570vd"]
[ext_resource type="PhysicsMaterial" uid="uid://c5tm7od8mwjjb" path="res://elastic.tres" id="1_1oplx"]
[ext_resource type="Script" path="res://Shield.gd" id="2_q7qjq"]
-[ext_resource type="Texture2D" uid="uid://comgu2t784y8f" path="res://shield.png" id="3_hrquq"]
-[ext_resource type="SpriteFrames" uid="uid://6oj6l7lnsjhi" path="res://exagon.gif" id="4_cfpay"]
+[ext_resource type="Texture2D" uid="uid://ciwpkhcp4pvqt" path="res://exagon.png" id="3_445cx"]
[ext_resource type="AudioStream" uid="uid://b73ik24u615jc" path="res://phaserDown1.ogg" id="5_8ceda"]
-[sub_resource type="AtlasTexture" id="AtlasTexture_fi50y"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(0, 0, 128, 128)
+[sub_resource type="AtlasTexture" id="AtlasTexture_cymp8"]
+atlas = ExtResource("3_445cx")
+region = Rect2(0, 0, 32, 32)
-[sub_resource type="AtlasTexture" id="AtlasTexture_evg51"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(128, 0, 128, 128)
+[sub_resource type="AtlasTexture" id="AtlasTexture_xha3n"]
+atlas = ExtResource("3_445cx")
+region = Rect2(32, 0, 32, 32)
-[sub_resource type="AtlasTexture" id="AtlasTexture_gq34g"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(256, 0, 128, 128)
+[sub_resource type="AtlasTexture" id="AtlasTexture_fhmnk"]
+atlas = ExtResource("3_445cx")
+region = Rect2(64, 0, 32, 32)
-[sub_resource type="AtlasTexture" id="AtlasTexture_b1q8y"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(0, 128, 128, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_q6ecx"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(128, 128, 128, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mlwqr"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(256, 128, 128, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_faf3x"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(0, 256, 128, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_1s48p"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(128, 256, 128, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_e7kdo"]
-atlas = ExtResource("3_hrquq")
-region = Rect2(256, 256, 128, 128)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_2kvmu"]
+[sub_resource type="SpriteFrames" id="SpriteFrames_vytjk"]
animations = [{
"frames": [{
"duration": 1.0,
-"texture": SubResource("AtlasTexture_fi50y")
+"texture": SubResource("AtlasTexture_cymp8")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_evg51")
+"texture": SubResource("AtlasTexture_xha3n")
}, {
"duration": 1.0,
-"texture": SubResource("AtlasTexture_gq34g")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_b1q8y")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_q6ecx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_mlwqr")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_faf3x")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_1s48p")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_e7kdo")
+"texture": SubResource("AtlasTexture_fhmnk")
}],
"loop": true,
"name": &"default",
-"speed": 10.0
+"speed": 5.0
}]
[sub_resource type="CircleShape2D" id="CircleShape2D_evq3y"]
@@ -89,13 +46,11 @@ physics_material_override = ExtResource("1_1oplx")
script = ExtResource("2_q7qjq")
[node name="Sprite" type="AnimatedSprite2D" parent="Shield"]
-self_modulate = Color(0.529412, 0.819608, 1, 0.27451)
z_index = 2
-position = Vector2(17, 2)
rotation = 1.5708
-scale = Vector2(4.39062, 4.39062)
-sprite_frames = SubResource("SpriteFrames_2kvmu")
-frame_progress = 0.973867
+scale = Vector2(1.65653, 1.66727)
+sprite_frames = SubResource("SpriteFrames_vytjk")
+frame_progress = 0.838782
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Shield"]
visible = false
@@ -112,8 +67,7 @@ pitch_scale = 0.95
texture_filter = 1
position = Vector2(-0.500002, 0.500002)
scale = Vector2(1.59375, 1.59375)
-sprite_frames = ExtResource("4_cfpay")
-animation = &"gif"
+animation = &""
autoplay = "gif"
frame_progress = 0.425841
diff --git a/godotgif/LICENSE.txt b/godotgif/LICENSE.txt
deleted file mode 100644
index f8a2334..0000000
--- a/godotgif/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 B0TLANNER Games
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/godotgif/README.md b/godotgif/README.md
deleted file mode 100644
index 019419b..0000000
--- a/godotgif/README.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# Godot GIF
-
-
-
- 
-
-
-
- 
- 
-
-
-
-## Description
-GDExtension for Godot 4+ to load GIF files as [AnimatedTexture](https://docs.godotengine.org/en/stable/classes/class_animatedtexture.html) and/or [SpriteFrames](https://docs.godotengine.org/en/stable/classes/class_spriteframes.html).
-
-NOTE: ~~**AnimatedTexture**~~ has been marked as deprecated according to development docs and could be removed in a future version of Godot.
-
-
-## Usage
-
-### Editor
-
-Gif files can be imported at edit time as one of the supported types via Import options.
-
-
- Editor Imports Options
-
-
-
-
-See the [Editor Imports](./demo/editor_imports_example.tscn) example scene.
-
- Editor Imports Example
-
-
-
-
-
-
-### Runtime
-
-Gif files can be loaded at runtime as one of the supported types via the `GifManager` singleton.
-
-`GifManager` exposes the following methods for loading gifs either from file or from bytes directly:
-
-
-e.g. to load from file
-```py
-get_node("AnimFromRuntimeFile").texture = GifManager.animated_texture_from_file("res://examples/file/optic.gif")
-
-get_node("AnimatedSprite2RuntimeFile").sprite_frames = GifManager.sprite_frames_from_file("res://examples/file/optic.gif")
-```
-
-See the [Runtime Imports](./demo/main.tscn) example scene.
-
- Runtime Imports Example
-
-
-
-
-
-## Installation
-
-Download the `gdextension` artifact from the [latest successful build](https://github.com/BOTLANNER/godot-gif/actions/workflows/build_releases.yml). (It should be right at the bottom of the **Summary**)
-
-
-Extract the contents to your Godot project directory.
-
-You should have an `addons` directory at the root with the following structure:
-```bash
-└───addons
- └───godotgif
- │ godotgif.gdextension
- │ LICENSE.txt
- │ README.md
- │
- └───bin
- │ godotgif.windows.template_debug.x86_32.dll
- │ godotgif.windows.template_debug.x86_64.dll
- │ godotgif.windows.template_release.x86_32.dll
- │ godotgif.windows.template_release.x86_64.dll
- │ libgodotgif.android.template_debug.arm64.so
- │ libgodotgif.android.template_release.arm64.so
- │ libgodotgif.linux.template_debug.x86_32.so
- │ libgodotgif.linux.template_debug.x86_64.so
- │ libgodotgif.linux.template_release.x86_32.so
- │ libgodotgif.linux.template_release.x86_64.so
- │
- ├───godotgif.macos.template_debug.framework
- │ libgodotgif.macos.template_debug
- │
- └───godotgif.macos.template_release.framework
- libgodotgif.macos.template_release
-```
-
-Open your project. Any exisitng gifs should auto-import. New gifs in the project directory will automatically import as `SpriteFrames`. To convert them into `AnimatedTexture`, update the [import settings](#editor).
-
-The `GifManager` class should also now be available for access within GDScript.
-
-## Contributing
-
-### Setup
-
-Ensure **SCons** is setup. Refer to [Introduction to the buildsystem](https://docs.godotengine.org/en/stable/contributing/development/compiling/introduction_to_the_buildsystem.html)
-
-* If using a different version of Godot, be sure to dump the bindings e.g.
- ```sh
- godot --dump-extension-api extension_api.json
- ```
-* Compile with
- ```sh
- scons platform= custom_api_file=extension_api.json
- ```
-
-### Debugging
-
-This repository is configured for use with [VSCode](https://code.visualstudio.com/)
-
-[Launch configurations](./.vscode/launch.json) have been setup for both debugging in editor and in runtime provided certain **VSCode** extensions are present and environment variables are defined.
-
-The following environment variables are required:
-
-1. `GODOT_PATH` - The directory in which Godot is installed
-1. `GODOT_EXECUTABLE` - The executable name of the Godot installation
-
-### More Details
-Refer to [GDExtension C++ example](https://docs.godotengine.org/en/stable/tutorials/scripting/gdextension/gdextension_cpp_example.html)
-
-
-## License
-
-Unless otherwise specified, the extension is released under the
-[MIT license](LICENSE.txt).
-
-See the full list of third-party libraries with their licenses used by this
-extension at [src/thirdparty/README.md](src/thirdparty/README.md).
-
-This implementation heavily borrowed inspiration from the [gif module](https://github.com/goostengine/goost/tree/gd3/modules/gif) for [Goost](https://github.com/goostengine/goost) that is currently only based on Godot 3
diff --git a/godotgif/bin/godotgif.macos.template_debug.framework/libgodotgif.macos.template_debug b/godotgif/bin/godotgif.macos.template_debug.framework/libgodotgif.macos.template_debug
deleted file mode 100644
index 1c6c773..0000000
Binary files a/godotgif/bin/godotgif.macos.template_debug.framework/libgodotgif.macos.template_debug and /dev/null differ
diff --git a/godotgif/bin/godotgif.macos.template_release.framework/libgodotgif.macos.template_release b/godotgif/bin/godotgif.macos.template_release.framework/libgodotgif.macos.template_release
deleted file mode 100644
index dcbb2ea..0000000
Binary files a/godotgif/bin/godotgif.macos.template_release.framework/libgodotgif.macos.template_release and /dev/null differ
diff --git a/godotgif/bin/godotgif.windows.template_debug.x86_32.dll b/godotgif/bin/godotgif.windows.template_debug.x86_32.dll
deleted file mode 100644
index 84b492d..0000000
Binary files a/godotgif/bin/godotgif.windows.template_debug.x86_32.dll and /dev/null differ
diff --git a/godotgif/bin/godotgif.windows.template_debug.x86_64.dll b/godotgif/bin/godotgif.windows.template_debug.x86_64.dll
deleted file mode 100644
index 503c2d6..0000000
Binary files a/godotgif/bin/godotgif.windows.template_debug.x86_64.dll and /dev/null differ
diff --git a/godotgif/bin/godotgif.windows.template_release.x86_32.dll b/godotgif/bin/godotgif.windows.template_release.x86_32.dll
deleted file mode 100644
index 021e7bd..0000000
Binary files a/godotgif/bin/godotgif.windows.template_release.x86_32.dll and /dev/null differ
diff --git a/godotgif/bin/godotgif.windows.template_release.x86_64.dll b/godotgif/bin/godotgif.windows.template_release.x86_64.dll
deleted file mode 100644
index 4ffd517..0000000
Binary files a/godotgif/bin/godotgif.windows.template_release.x86_64.dll and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.android.template_debug.arm64.so b/godotgif/bin/libgodotgif.android.template_debug.arm64.so
deleted file mode 100644
index a5d8f53..0000000
Binary files a/godotgif/bin/libgodotgif.android.template_debug.arm64.so and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.android.template_release.arm64.so b/godotgif/bin/libgodotgif.android.template_release.arm64.so
deleted file mode 100644
index 6f34958..0000000
Binary files a/godotgif/bin/libgodotgif.android.template_release.arm64.so and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.linux.template_debug.x86_32.so b/godotgif/bin/libgodotgif.linux.template_debug.x86_32.so
deleted file mode 100644
index ed99762..0000000
Binary files a/godotgif/bin/libgodotgif.linux.template_debug.x86_32.so and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.linux.template_debug.x86_64.so b/godotgif/bin/libgodotgif.linux.template_debug.x86_64.so
deleted file mode 100644
index 1368208..0000000
Binary files a/godotgif/bin/libgodotgif.linux.template_debug.x86_64.so and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.linux.template_release.x86_32.so b/godotgif/bin/libgodotgif.linux.template_release.x86_32.so
deleted file mode 100644
index eb9dc8d..0000000
Binary files a/godotgif/bin/libgodotgif.linux.template_release.x86_32.so and /dev/null differ
diff --git a/godotgif/bin/libgodotgif.linux.template_release.x86_64.so b/godotgif/bin/libgodotgif.linux.template_release.x86_64.so
deleted file mode 100644
index d53992d..0000000
Binary files a/godotgif/bin/libgodotgif.linux.template_release.x86_64.so and /dev/null differ
diff --git a/godotgif/godotgif.gdextension b/godotgif/godotgif.gdextension
deleted file mode 100644
index fb241a2..0000000
--- a/godotgif/godotgif.gdextension
+++ /dev/null
@@ -1,23 +0,0 @@
-[configuration]
-
-entry_symbol = "godot_gif_library_init"
-compatibility_minimum = "4.1"
-
-[libraries]
-
-macos.debug = "bin/godotgif.macos.template_debug.framework/libgodotgif.macos.template_debug"
-macos.release = "bin/godotgif.macos.template_release.framework/libgodotgif.macos.template_release"
-windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll"
-windows.release.x86_32 = "bin/godotgif.windows.template_release.x86_32.dll"
-windows.debug.x86_64 = "bin/godotgif.windows.template_debug.x86_64.dll"
-windows.release.x86_64 = "bin/godotgif.windows.template_release.x86_64.dll"
-linux.debug.x86_64 = "bin/libgodotgif.linux.template_debug.x86_64.so"
-linux.release.x86_64 = "bin/libgodotgif.linux.template_release.x86_64.so"
-linux.debug.arm64 = "bin/libgodotgif.linux.template_debug.arm64.so"
-linux.release.arm64 = "bin/libgodotgif.linux.template_release.arm64.so"
-linux.debug.rv64 = "bin/libgodotgif.linux.template_debug.rv64.so"
-linux.release.rv64 = "bin/libgodotgif.linux.template_release.rv64.so"
-android.debug.x86_64 = "bin/libgodotgif.android.template_debug.x86_64.so"
-android.release.x86_64 = "bin/libgodotgif.android.template_release.x86_64.so"
-android.debug.arm64 = "bin/libgodotgif.android.template_debug.arm64.so"
-android.release.arm64 = "bin/libgodotgif.android.template_release.arm64.so"
diff --git a/ircle.gif b/ircle.gif
deleted file mode 100644
index 51fd1a0..0000000
Binary files a/ircle.gif and /dev/null differ
diff --git a/ircle.gif.import b/ircle.gif.import
deleted file mode 100644
index 06b750b..0000000
--- a/ircle.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://d320lntdiw2kj"
-path="res://.godot/imported/ircle.gif-26b2402ba63dd6acab9d6ebfcba3ae9d.tres"
-
-[deps]
-
-source_file="res://ircle.gif"
-dest_files=["res://.godot/imported/ircle.gif-26b2402ba63dd6acab9d6ebfcba3ae9d.tres"]
-
-[params]
-
-frames_per_second=5
diff --git a/ircle.png b/ircle.png
new file mode 100644
index 0000000..cf697be
Binary files /dev/null and b/ircle.png differ
diff --git a/ircle.png.import b/ircle.png.import
new file mode 100644
index 0000000..12cbff6
--- /dev/null
+++ b/ircle.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://pvrk6wkx47kn"
+path="res://.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ircle.png"
+dest_files=["res://.godot/imported/ircle.png-8cb56bdd5c3bcf7f1450bfc91fee939c.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/ircle.tscn b/ircle.tscn
index 45b3140..7ce3233 100644
--- a/ircle.tscn
+++ b/ircle.tscn
@@ -1,11 +1,117 @@
-[gd_scene load_steps=7 format=3 uid="uid://4lc6bvf7b8a0"]
+[gd_scene load_steps=22 format=3 uid="uid://4lc6bvf7b8a0"]
[ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="2_3i0n3"]
[ext_resource type="Script" path="res://laser_enemy.gd" id="2_lyi2i"]
[ext_resource type="Script" path="res://Laser.gd" id="3_hosl5"]
-[ext_resource type="SpriteFrames" uid="uid://d320lntdiw2kj" path="res://ircle.gif" id="3_ys12y"]
+[ext_resource type="Texture2D" uid="uid://pvrk6wkx47kn" path="res://ircle.png" id="4_qdecp"]
[ext_resource type="AudioStream" uid="uid://4ou7posn1vbd" path="res://laserSmall_004.ogg" id="5_tkxjf"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_m6u7o"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(0, 0, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_thiwg"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(24, 0, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ty71x"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(48, 0, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ac61s"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(72, 0, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sx0yi"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(96, 0, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_lxp8e"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(0, 24, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rumou"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(24, 24, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_adgux"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(48, 24, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_xlia3"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(72, 24, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ssqcu"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(96, 24, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_86b3m"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(0, 48, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_psh1s"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(24, 48, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_2jx4o"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(48, 48, 24, 24)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pwarp"]
+atlas = ExtResource("4_qdecp")
+region = Rect2(72, 48, 24, 24)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_s64kc"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_m6u7o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_thiwg")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ty71x")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ac61s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sx0yi")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_lxp8e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rumou")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_adgux")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_xlia3")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ssqcu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_86b3m")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_psh1s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_2jx4o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pwarp")
+}],
+"loop": true,
+"name": &"shoot",
+"speed": 5.0
+}]
+
[sub_resource type="CircleShape2D" id="CircleShape2D_yns8h"]
radius = 128.0
@@ -35,10 +141,8 @@ collision_mask = 3
texture_filter = 1
position = Vector2(-7.62939e-06, 7.62939e-06)
scale = Vector2(10.8333, 10.8333)
-sprite_frames = ExtResource("3_ys12y")
-animation = &"gif"
-frame = 1
-frame_progress = 0.670607
+sprite_frames = SubResource("SpriteFrames_s64kc")
+animation = &"shoot"
speed_scale = 2.6
[node name="Timer" type="Timer" parent="."]
diff --git a/ircle_laser.gif b/ircle_laser.gif
deleted file mode 100644
index 846cd78..0000000
Binary files a/ircle_laser.gif and /dev/null differ
diff --git a/ircle_laser.gif.import b/ircle_laser.gif.import
deleted file mode 100644
index dc00240..0000000
--- a/ircle_laser.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://byhtrcl2layo3"
-path="res://.godot/imported/ircle_laser.gif-0ef572a7c5fd1d9c8ca3ed9ae2a7f065.tres"
-
-[deps]
-
-source_file="res://ircle_laser.gif"
-dest_files=["res://.godot/imported/ircle_laser.gif-0ef572a7c5fd1d9c8ca3ed9ae2a7f065.tres"]
-
-[params]
-
-frames_per_second=5
diff --git a/ircle_laser.png b/ircle_laser.png
new file mode 100644
index 0000000..cd8cf96
Binary files /dev/null and b/ircle_laser.png differ
diff --git a/ircle_laser.png.import b/ircle_laser.png.import
new file mode 100644
index 0000000..ca5cedb
--- /dev/null
+++ b/ircle_laser.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dltnwd1hkclxi"
+path="res://.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ircle_laser.png"
+dest_files=["res://.godot/imported/ircle_laser.png-252e9bd0b10c7f4340705eb0342b52a4.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/laser_enemy.gd b/laser_enemy.gd
index efae5db..0e97b46 100644
--- a/laser_enemy.gd
+++ b/laser_enemy.gd
@@ -3,7 +3,7 @@ extends StaticBody2D
@onready var player = $"../Player"
var idle_texture = preload("res://dotted line.png")
var aiming_texture = preload("res://laser_idle.png")
-var active_texture = preload("res://ircle_laser.gif")
+var active_texture = preload("res://laser_idle.png")
var aiming = true
var can_damage = false
@@ -27,7 +27,7 @@ func _process(delta):
func fire_laser():
var tween = get_tree().create_tween()
- $Sprite2D.play("gif")
+ $Sprite2D.play("shoot")
aiming = false
tween.set_parallel(true)
tween.tween_callback(set_laser_texture.bind(aiming_texture))
diff --git a/player-apezoid.gd b/player-apezoid.gd
index 62026ff..6ff8148 100644
--- a/player-apezoid.gd
+++ b/player-apezoid.gd
@@ -5,7 +5,7 @@ var shooting = false
var idle_texture = preload("res://dotted line.png")
var aiming_texture = preload("res://laser_idle.png")
-var active_texture = preload("res://ircle_laser.gif")
+var active_texture = preload("res://laser_idle.png")
func _ready():
update_animation()
diff --git a/player-row.gd b/player-row.gd
index ad7b1d9..083cd2f 100644
--- a/player-row.gd
+++ b/player-row.gd
@@ -1,15 +1,10 @@
extends "res://player.gd"
-const idle_anim = preload("res://player_idle.gif")
-const moving_anim = preload("res://player_moving.gif")
-
func update_animation():
if moving:
- $AnimatedSprite2D.sprite_frames = moving_anim
+ $AnimatedSprite2D.play("moving")
else:
- $AnimatedSprite2D.sprite_frames = idle_anim
-
- $AnimatedSprite2D.play("gif")
+ $AnimatedSprite2D.play("idle")
func _ready():
update_display()
diff --git a/player-row.tscn b/player-row.tscn
index 832b80c..1e3f157 100644
--- a/player-row.tscn
+++ b/player-row.tscn
@@ -1,10 +1,178 @@
-[gd_scene load_steps=7 format=3 uid="uid://bfd8oqdyt6m3g"]
+[gd_scene load_steps=31 format=3 uid="uid://bfd8oqdyt6m3g"]
[ext_resource type="PackedScene" uid="uid://cgcjicue76wsr" path="res://player.tscn" id="1_r3mct"]
-[ext_resource type="SpriteFrames" uid="uid://cmkptgd3k37bl" path="res://player_idle.gif" id="2_sxnuc"]
[ext_resource type="Script" path="res://player-row.gd" id="2_ty4ic"]
[ext_resource type="AudioStream" uid="uid://cbghiy80qmaa0" path="res://powerUp6.ogg" id="3_sk1xt"]
+[ext_resource type="Texture2D" uid="uid://bd0inrlfuocmv" path="res://player_idle.png" id="3_yynte"]
[ext_resource type="AudioStream" uid="uid://mond5sdmukan" path="res://powerUp7.ogg" id="4_lwgj5"]
+[ext_resource type="Texture2D" uid="uid://uy21l35yd3p5" path="res://player_moving.png" id="4_x5jjw"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7dffy"]
+atlas = ExtResource("3_yynte")
+region = Rect2(0, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tasuj"]
+atlas = ExtResource("3_yynte")
+region = Rect2(128, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_teedx"]
+atlas = ExtResource("3_yynte")
+region = Rect2(256, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8d5p4"]
+atlas = ExtResource("3_yynte")
+region = Rect2(384, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bx2nk"]
+atlas = ExtResource("3_yynte")
+region = Rect2(512, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_fe8d6"]
+atlas = ExtResource("3_yynte")
+region = Rect2(0, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_rcq68"]
+atlas = ExtResource("3_yynte")
+region = Rect2(128, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_njhis"]
+atlas = ExtResource("3_yynte")
+region = Rect2(256, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ol8u8"]
+atlas = ExtResource("3_yynte")
+region = Rect2(384, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aqr8w"]
+atlas = ExtResource("3_yynte")
+region = Rect2(512, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8kmgo"]
+atlas = ExtResource("3_yynte")
+region = Rect2(0, 128, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_f4lm0"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(0, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ywwc6"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(128, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hug7e"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(256, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_reffa"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(384, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0h11x"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(512, 0, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_y8t3t"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(0, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hy4lm"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(128, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8sy5f"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(256, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_cuqi8"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(384, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_77f0j"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(512, 64, 128, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_y82q6"]
+atlas = ExtResource("4_x5jjw")
+region = Rect2(0, 128, 128, 64)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_1rjkk"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7dffy")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tasuj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_teedx")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8d5p4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bx2nk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_fe8d6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_rcq68")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_njhis")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ol8u8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_aqr8w")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8kmgo")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_f4lm0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ywwc6")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hug7e")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_reffa")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0h11x")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_y8t3t")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_hy4lm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8sy5f")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_cuqi8")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_77f0j")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_y82q6")
+}],
+"loop": true,
+"name": &"moving",
+"speed": 10.0
+}]
[sub_resource type="CircleShape2D" id="CircleShape2D_caugh"]
radius = 19.0263
@@ -16,10 +184,11 @@ script = ExtResource("2_ty4ic")
texture_filter = 1
position = Vector2(-33, 0)
scale = Vector2(1.2, 1.2)
-sprite_frames = ExtResource("2_sxnuc")
-animation = &"gif"
-frame = 5
-frame_progress = 0.885413
+sprite_frames = SubResource("SpriteFrames_1rjkk")
+animation = &"moving"
+autoplay = "idle"
+frame = 8
+frame_progress = 0.666665
speed_scale = 0.75
[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="2"]
diff --git a/player_idle.gif b/player_idle.gif
deleted file mode 100644
index ed28cb9..0000000
Binary files a/player_idle.gif and /dev/null differ
diff --git a/player_idle.gif.import b/player_idle.gif.import
deleted file mode 100644
index 28ee267..0000000
--- a/player_idle.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://cmkptgd3k37bl"
-path="res://.godot/imported/player_idle.gif-9b64932f60482d72b51297130434c2a2.tres"
-
-[deps]
-
-source_file="res://player_idle.gif"
-dest_files=["res://.godot/imported/player_idle.gif-9b64932f60482d72b51297130434c2a2.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/player_idle.png b/player_idle.png
new file mode 100644
index 0000000..a72ef9e
Binary files /dev/null and b/player_idle.png differ
diff --git a/player_idle.png.import b/player_idle.png.import
new file mode 100644
index 0000000..5d17768
--- /dev/null
+++ b/player_idle.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bd0inrlfuocmv"
+path="res://.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player_idle.png"
+dest_files=["res://.godot/imported/player_idle.png-2efe33ef1a0566afcb77800f42342525.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/player_moving.gif b/player_moving.gif
deleted file mode 100644
index 0a08ff2..0000000
Binary files a/player_moving.gif and /dev/null differ
diff --git a/player_moving.gif.import b/player_moving.gif.import
deleted file mode 100644
index 9427e74..0000000
--- a/player_moving.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://da51ca6ckjnkw"
-path="res://.godot/imported/player_moving.gif-d8300f9f12180ed80481eb9f96715752.tres"
-
-[deps]
-
-source_file="res://player_moving.gif"
-dest_files=["res://.godot/imported/player_moving.gif-d8300f9f12180ed80481eb9f96715752.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/player_moving.png b/player_moving.png
new file mode 100644
index 0000000..855d595
Binary files /dev/null and b/player_moving.png differ
diff --git a/player_moving.png.import b/player_moving.png.import
new file mode 100644
index 0000000..8c492d1
--- /dev/null
+++ b/player_moving.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://uy21l35yd3p5"
+path="res://.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://player_moving.png"
+dest_files=["res://.godot/imported/player_moving.png-a7ae0f76ef92ad7505ceb10459f03aa6.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/portal-mask.gif b/portal-mask.gif
deleted file mode 100644
index 4f0293d..0000000
Binary files a/portal-mask.gif and /dev/null differ
diff --git a/portal-mask.gif.import b/portal-mask.gif.import
deleted file mode 100644
index 69341f1..0000000
--- a/portal-mask.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://bhut2leth5pcl"
-path="res://.godot/imported/portal-mask.gif-2b400c284dba35e66ceaf3d4df8621a3.tres"
-
-[deps]
-
-source_file="res://portal-mask.gif"
-dest_files=["res://.godot/imported/portal-mask.gif-2b400c284dba35e66ceaf3d4df8621a3.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/portal-sprite.gif b/portal-sprite.gif
deleted file mode 100644
index 24c02c5..0000000
Binary files a/portal-sprite.gif and /dev/null differ
diff --git a/portal-sprite.gif.import b/portal-sprite.gif.import
deleted file mode 100644
index 122b3ce..0000000
--- a/portal-sprite.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://cejgerinde63x"
-path="res://.godot/imported/portal-sprite.gif-97fd47c3b8c83e35c7f6fff190180c12.tres"
-
-[deps]
-
-source_file="res://portal-sprite.gif"
-dest_files=["res://.godot/imported/portal-sprite.gif-97fd47c3b8c83e35c7f6fff190180c12.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/quare 2.png b/quare 2.png
new file mode 100644
index 0000000..80c41a4
Binary files /dev/null and b/quare 2.png differ
diff --git a/quare 2.png.import b/quare 2.png.import
new file mode 100644
index 0000000..a0ffe09
--- /dev/null
+++ b/quare 2.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ba2tcipuc8rdi"
+path="res://.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://quare 2.png"
+dest_files=["res://.godot/imported/quare 2.png-6c529a84d73cdc15ec1857a295f834a1.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/quare.gd b/quare.gd
index a444076..51717c8 100644
--- a/quare.gd
+++ b/quare.gd
@@ -1,8 +1,5 @@
extends StaticBody2D
-func _ready():
- $AnimatedSprite.play("gif")
-
func destroy():
if not is_queued_for_deletion():
var explosion = load("res://explosion.tscn").instantiate()
diff --git a/quare.gif b/quare.gif
deleted file mode 100644
index f60b628..0000000
Binary files a/quare.gif and /dev/null differ
diff --git a/quare.gif.import b/quare.gif.import
deleted file mode 100644
index b773888..0000000
--- a/quare.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://bk3xnipssntsj"
-path="res://.godot/imported/quare.gif-8d0f055527b78c6c14edade45fddf843.tres"
-
-[deps]
-
-source_file="res://quare.gif"
-dest_files=["res://.godot/imported/quare.gif-8d0f055527b78c6c14edade45fddf843.tres"]
-
-[params]
-
-frames_per_second=5
diff --git a/quare.tscn b/quare.tscn
index bfe5568..091da96 100644
--- a/quare.tscn
+++ b/quare.tscn
@@ -1,9 +1,136 @@
-[gd_scene load_steps=6 format=3 uid="uid://b2tkfnqhx5xv"]
+[gd_scene load_steps=24 format=3 uid="uid://b2tkfnqhx5xv"]
[ext_resource type="PhysicsMaterial" uid="uid://c5tm7od8mwjjb" path="res://elastic.tres" id="1_xwtag"]
[ext_resource type="Script" path="res://quare.gd" id="2_iatrf"]
[ext_resource type="Script" path="res://LockedRotation.gd" id="3_g8sg8"]
-[ext_resource type="SpriteFrames" uid="uid://bk3xnipssntsj" path="res://quare.gif" id="4_js2va"]
+[ext_resource type="Texture2D" uid="uid://ba2tcipuc8rdi" path="res://quare 2.png" id="3_m8c8s"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4y3ad"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(0, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3ggbj"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(64, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_gxfum"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(128, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_tjvby"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(192, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ow70i"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(256, 0, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_453cp"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(0, 64, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_l1inn"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(64, 64, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_nlxfh"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(128, 64, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_8yx7k"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(192, 64, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_73s05"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(256, 64, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jrpq7"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(0, 128, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yvo0s"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(64, 128, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5e0js"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(128, 128, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7nwpc"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(192, 128, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_b7d6i"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(256, 128, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ll0hm"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(0, 192, 64, 64)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yx1wl"]
+atlas = ExtResource("3_m8c8s")
+region = Rect2(64, 192, 64, 64)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_mpdcb"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4y3ad")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3ggbj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_gxfum")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_tjvby")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ow70i")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_453cp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l1inn")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_nlxfh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_8yx7k")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_73s05")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jrpq7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yvo0s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5e0js")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7nwpc")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_b7d6i")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ll0hm")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yx1wl")
+}],
+"loop": true,
+"name": &"default",
+"speed": 15.0
+}]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_e1p40"]
size = Vector2(155, 155)
@@ -14,9 +141,11 @@ physics_material_override = ExtResource("1_xwtag")
script = ExtResource("2_iatrf")
[node name="AnimatedSprite" type="AnimatedSprite2D" parent="."]
-scale = Vector2(2.41138, 2.42673)
-sprite_frames = ExtResource("4_js2va")
-animation = &"gif"
+scale = Vector2(2.8, 2.8)
+sprite_frames = SubResource("SpriteFrames_mpdcb")
+autoplay = "default"
+frame = 1
+frame_progress = 0.297622
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_e1p40")
diff --git a/riangle.gif b/riangle.gif
deleted file mode 100644
index a1eb8f5..0000000
Binary files a/riangle.gif and /dev/null differ
diff --git a/riangle.gif.import b/riangle.gif.import
deleted file mode 100644
index fd3a22d..0000000
--- a/riangle.gif.import
+++ /dev/null
@@ -1,15 +0,0 @@
-[remap]
-
-importer="import_gif_to_sprite_frames"
-type="SpriteFrames"
-uid="uid://dt3chppm3qub7"
-path="res://.godot/imported/riangle.gif-caa79ebfc0c2c280f2898463cf930386.tres"
-
-[deps]
-
-source_file="res://riangle.gif"
-dest_files=["res://.godot/imported/riangle.gif-caa79ebfc0c2c280f2898463cf930386.tres"]
-
-[params]
-
-frames_per_second=30
diff --git a/riangle.png b/riangle.png
new file mode 100644
index 0000000..a59d645
Binary files /dev/null and b/riangle.png differ
diff --git a/riangle.png.import b/riangle.png.import
new file mode 100644
index 0000000..68f059e
--- /dev/null
+++ b/riangle.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dm8o6cwq2jtaq"
+path="res://.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://riangle.png"
+dest_files=["res://.godot/imported/riangle.png-6dfde760d11c02ec77fee950717d0a5f.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/riangle.tscn b/riangle.tscn
index 8c05f5a..74f83a5 100644
--- a/riangle.tscn
+++ b/riangle.tscn
@@ -1,10 +1,74 @@
-[gd_scene load_steps=5 format=3 uid="uid://yu50iyftoyaj"]
+[gd_scene load_steps=14 format=3 uid="uid://yu50iyftoyaj"]
-[ext_resource type="SpriteFrames" uid="uid://dt3chppm3qub7" path="res://riangle.gif" id="1_5ndal"]
[ext_resource type="Script" path="res://riangle.gd" id="1_0404b"]
+[ext_resource type="Texture2D" uid="uid://dm8o6cwq2jtaq" path="res://riangle.png" id="2_rgnr7"]
[ext_resource type="Script" path="res://Gun.gd" id="3_kffl0"]
[ext_resource type="PackedScene" uid="uid://c6ybtahxwpukd" path="res://bullet.tscn" id="4_tfncc"]
+[sub_resource type="AtlasTexture" id="AtlasTexture_fb5mh"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(0, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4gcy0"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(40, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mhrqf"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(80, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_6cbkq"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(120, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_yud03"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(160, 0, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kn3w7"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(0, 40, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sn7s2"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(80, 40, 40, 40)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pssaw"]
+atlas = ExtResource("2_rgnr7")
+region = Rect2(40, 40, 40, 40)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_p5dvv"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_fb5mh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4gcy0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mhrqf")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6cbkq")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_yud03")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kn3w7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sn7s2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pssaw")
+}],
+"loop": true,
+"name": &"default",
+"speed": 10.0
+}]
+
[node name="Riangle" type="StaticBody2D" groups=["destructible", "enemy"]]
scale = Vector2(0.25, 0.25)
script = ExtResource("1_0404b")
@@ -14,11 +78,8 @@ texture_filter = 1
position = Vector2(-21.5874, 1.58741)
rotation = 1.5708
scale = Vector2(5.50033, 5.50033)
-sprite_frames = ExtResource("1_5ndal")
-animation = &"gif"
-autoplay = "gif"
-frame_progress = 0.383366
-speed_scale = 2.0
+sprite_frames = SubResource("SpriteFrames_p5dvv")
+autoplay = "default"
[node name="Gun2" type="Marker2D" parent="."]
position = Vector2(-224, 284)