Merge branch 'main' into fully_generalized_fish

1 files changed, 282 insertions, 1 deletions

diff --git a/scenes/gameover.tscn b/scenes/gameover.tscn
index 7875ded..7759edd 100644
--- a/scenes/gameover.tscn
+++ b/scenes/gameover.tscn
@@ -1,10 +1,285 @@
-[gd_scene load_steps=6 format=3 uid="uid://dv67unre56t5b"]
+[gd_scene load_steps=46 format=3 uid="uid://be813saajvxxs"]
 
 [ext_resource type="Texture2D" uid="uid://dobiydav6k32e" path="res://UI/GameOverScreen.png" id="1_60m3n"]
 [ext_resource type="Script" path="res://scenes/gameover.gd" id="1_clwwq"]
 [ext_resource type="Texture2D" uid="uid://dje61ck7cl66a" path="res://UI/minimizebuttonpressed.png" id="2_j8fs8"]
 [ext_resource type="Texture2D" uid="uid://brlgi3g1hy155" path="res://UI/xbuttonpressed.png" id="2_wb6l8"]
 [ext_resource type="Theme" uid="uid://ve18rbkeiwti" path="res://UI/text.tres" id="4_kotik"]
+[ext_resource type="Texture2D" uid="uid://dohsqvvi8y64h" path="res://UI/fish-spinning-ezgif.com-gif-to-sprite-converter.png" id="6_87scw"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_uyge7"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1440, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_q361v"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1920, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_xg08o"]
+atlas = ExtResource("6_87scw")
+region = Rect2(2400, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_5wrxk"]
+atlas = ExtResource("6_87scw")
+region = Rect2(2880, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_sqk41"]
+atlas = ExtResource("6_87scw")
+region = Rect2(3360, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_v7jwr"]
+atlas = ExtResource("6_87scw")
+region = Rect2(3840, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_7b85l"]
+atlas = ExtResource("6_87scw")
+region = Rect2(4320, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pm4lk"]
+atlas = ExtResource("6_87scw")
+region = Rect2(4800, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_gb3cd"]
+atlas = ExtResource("6_87scw")
+region = Rect2(5280, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aujti"]
+atlas = ExtResource("6_87scw")
+region = Rect2(5760, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kssee"]
+atlas = ExtResource("6_87scw")
+region = Rect2(6240, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_awsou"]
+atlas = ExtResource("6_87scw")
+region = Rect2(6720, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_dqry7"]
+atlas = ExtResource("6_87scw")
+region = Rect2(7200, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_l2edp"]
+atlas = ExtResource("6_87scw")
+region = Rect2(7680, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_06kk0"]
+atlas = ExtResource("6_87scw")
+region = Rect2(8160, 540, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_wyica"]
+atlas = ExtResource("6_87scw")
+region = Rect2(0, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_bl2fa"]
+atlas = ExtResource("6_87scw")
+region = Rect2(480, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ljnbe"]
+atlas = ExtResource("6_87scw")
+region = Rect2(960, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_48vwo"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1440, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0ffer"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1920, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_pmw51"]
+atlas = ExtResource("6_87scw")
+region = Rect2(2400, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_h13o4"]
+atlas = ExtResource("6_87scw")
+region = Rect2(2880, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_i5rca"]
+atlas = ExtResource("6_87scw")
+region = Rect2(3360, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_1w2n4"]
+atlas = ExtResource("6_87scw")
+region = Rect2(3840, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_t4ovh"]
+atlas = ExtResource("6_87scw")
+region = Rect2(4320, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3ykvn"]
+atlas = ExtResource("6_87scw")
+region = Rect2(4800, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j2usu"]
+atlas = ExtResource("6_87scw")
+region = Rect2(5280, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_qwxmp"]
+atlas = ExtResource("6_87scw")
+region = Rect2(5760, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_muy25"]
+atlas = ExtResource("6_87scw")
+region = Rect2(6240, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_3fnw4"]
+atlas = ExtResource("6_87scw")
+region = Rect2(6720, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_teehr"]
+atlas = ExtResource("6_87scw")
+region = Rect2(7200, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mflgh"]
+atlas = ExtResource("6_87scw")
+region = Rect2(7680, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vy71g"]
+atlas = ExtResource("6_87scw")
+region = Rect2(8160, 810, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vhs7i"]
+atlas = ExtResource("6_87scw")
+region = Rect2(0, 1080, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_50ge1"]
+atlas = ExtResource("6_87scw")
+region = Rect2(480, 1080, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_16ov1"]
+atlas = ExtResource("6_87scw")
+region = Rect2(960, 1080, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_epju2"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1440, 1080, 480, 270)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_vpon3"]
+atlas = ExtResource("6_87scw")
+region = Rect2(1920, 1080, 480, 270)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_srpk5"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_uyge7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_q361v")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_xg08o")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_5wrxk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_sqk41")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_v7jwr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_7b85l")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pm4lk")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_gb3cd")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_aujti")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_kssee")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_awsou")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_dqry7")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_l2edp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_06kk0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_wyica")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_bl2fa")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ljnbe")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_48vwo")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0ffer")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_pmw51")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_h13o4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_i5rca")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_1w2n4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_t4ovh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3ykvn")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_j2usu")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_qwxmp")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_muy25")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_3fnw4")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_teehr")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mflgh")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vy71g")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vhs7i")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_50ge1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_16ov1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_epju2")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_vpon3")
+}],
+"loop": true,
+"name": &"default",
+"speed": 36.0
+}]
 
 [node name="Node2D3" type="Node2D"]
 script = ExtResource("1_clwwq")
@@ -39,5 +314,11 @@ theme = ExtResource("4_kotik")
 text = "You made $
 You lost $"
 
+[node name="Rotating fish" type="AnimatedSprite2D" parent="."]
+position = Vector2(27, 26)
+scale = Vector2(0.0416667, 0.0740741)
+sprite_frames = SubResource("SpriteFrames_srpk5")
+autoplay = "default"
+
 [connection signal="button_up" from="Close" to="." method="_on_close_button_up"]
 [connection signal="button_up" from="Minimize" to="." method="_on_minimize_button_up"]