diff --git a/README.md b/README.md index f31166d..4ff031d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Apologies in advance for the messy code :) ## License -Music is by [Ivy Snyder](https://ivsnyd.bandcamp.com/) and licensed under +Music is by [Scarlett Sylvistrix](https://ivsnyd.bandcamp.com/) and licensed under the [CC-BY license](LICENSE-ASSETS) except for end credits cover of "You're Wondering Now". "You're Wondering Now" is not licensed for re-use. diff --git a/credits.txt b/credits.txt index 4a6674d..66b51f7 100644 --- a/credits.txt +++ b/credits.txt @@ -1,3 +1,3 @@ Game by Penny Rigate -Music by Ivy Snyder (https://ivysnyder.newgrounds.com/) -Shaders and code help by Haze \ No newline at end of file +Music by Scarlett Sylvistrix (https://ivysnyder.newgrounds.com/) +Shaders and code help by Haze diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 89e099d..7c2bfaa 100644 Binary files a/graphics/hud/title_credits.png and b/graphics/hud/title_credits.png differ diff --git a/menus/credits.tscn b/menus/credits.tscn index 256b952..0407de7 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -712,7 +712,7 @@ margin_right = 128.0 margin_bottom = 105.0 theme = ExtResource( 6 ) text = "Team SG is: Penny rigate, -Haze Weathers, Ivy snyder +Haze Weathers, Scarlett Sylvistrix and Dog Jelly. " align = 1 @@ -783,7 +783,7 @@ margin_left = 1280.0 margin_right = 1536.0 margin_bottom = 192.0 theme = ExtResource( 6 ) -text = "-Ivy \"Shedge\" Snyder- +text = "-Scarlett \"Shedge\" Sylvistrix- Lead Composer Sound effects mixing" @@ -846,7 +846,7 @@ theme = ExtResource( 6 ) text = "-Our playtesters- Penny rigate Haze Weathers -Ivy snyder +Scarlett Sylvistrix DogJelly Wolfboy Rhidianruckus @@ -918,7 +918,6 @@ text = "SG" [node name="Speccy" type="AnimatedSprite" parent="Control/RollCall1"] position = Vector2( 155, 68 ) frames = SubResource( 97 ) -frame = 5 playing = true [node name="Label" type="Label" parent="Control/RollCall1/Speccy"] @@ -935,7 +934,6 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) -frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -965,7 +963,6 @@ align = 1 [node name="Fami" type="AnimatedSprite" parent="Control/RollCall1"] position = Vector2( 152, 135 ) frames = SubResource( 100 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall1/Fami"] @@ -1085,7 +1082,6 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) -frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1117,7 +1113,6 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1163,7 +1158,6 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1193,7 +1187,6 @@ align = 1 [node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 200, 64 ) frames = SubResource( 65 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Squig"] @@ -1210,7 +1203,6 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) -frame = 3 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1227,7 +1219,6 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) -frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1257,7 +1248,6 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" -frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1265,7 +1255,6 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" -frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1362,6 +1351,7 @@ position = Vector2( 1024, 0 ) [node name="2600" parent="Control/RollCall4" instance=ExtResource( 37 )] position = Vector2( 3464, -8 ) +make_explosions = true [node name="ShootTimer" parent="Control/RollCall4/2600" index="2"] autostart = false diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index 1e54358..740a33d 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -193,7 +193,6 @@ material = SubResource( 12 ) position = Vector2( 72, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] @@ -201,7 +200,6 @@ material = SubResource( 12 ) position = Vector2( 112, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite4" type="AnimatedSprite" parent="."] @@ -209,7 +207,6 @@ material = SubResource( 12 ) position = Vector2( 152, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite5" type="AnimatedSprite" parent="."] @@ -217,7 +214,6 @@ material = SubResource( 12 ) position = Vector2( 192, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="Music" type="TextureButton" parent="."] @@ -266,7 +262,7 @@ margin_bottom = 121.0 focus_neighbour_top = NodePath("../Music") texture_focused = ExtResource( 27 ) script = ExtResource( 16 ) -titles = [ "Select", "Confirm", "Jump", "Double Jump", "Land", "Climb", "Bmilc", "Shoot", "Die", "Sploosh", "Bzaap", "Teleport", "Gover", "Key Get", "Arrow Get", "Star Get", "Skeleton Die", "Scrump Shoot", "Scrump Hurt", "Scrump Die", "Bubble Get", "Big Explosion", "Collapse", "Glass Break", "Bullet Barrage", "Laser Charge", "Rainbow Laser", "Mech Hurt 1", "Mech Hurt 2", "Mech Hurt 3", "Small Explosion", "Bullet Casing", "Button Click", "Ominous", "GunCock", "Shards Expelled", "Shards Absorbed", "Shard Float", "Fami Transform", "Scope Squish", "Scope Splat", "Famira Roar", "2083 Shoot", "Laser Ready", "Famira Breath", "Critical Heat", "Famira Die", "Collected Shard", "Missed Shard", "Final Score", "Revolution 2083", "Shard Get", "Good Job!", "Great Job!", "Victory", "Wonderful!", "Come Here", "Help Me", "Agh!", "Fuck!", "Shit...", "Take This", "Fami's Grand Plan", "Debug M", "Spaghetti", "Sword", "Egg Collect", "Talking", "Fami Grumble", "Segz", "Mech Creak", "Mech Step 1", "Mech Step 2", "Mech Walking", "Mech Duck", "Mech Unduck", "Resolve", "Robolution 2083", "Ivolution 2083", "Dogolution 2083", "Classic Good Job", "Good Job - Ivy", "Good Job - Dog", "Great Job - Ivy", "Great Job - Dog", "Classic Wonderful", "Wonderful - Ivy", "Wonderful - Dog", "Fucking Cop...", "Goddammit...", "Motherfucker...", "Intro Voiceover" ] +titles = [ "Select", "Confirm", "Jump", "Double Jump", "Land", "Climb", "Bmilc", "Shoot", "Die", "Sploosh", "Bzaap", "Teleport", "Gover", "Key Get", "Arrow Get", "Star Get", "Skeleton Die", "Scrump Shoot", "Scrump Hurt", "Scrump Die", "Bubble Get", "Big Explosion", "Collapse", "Glass Break", "Bullet Barrage", "Laser Charge", "Rainbow Laser", "Mech Hurt 1", "Mech Hurt 2", "Mech Hurt 3", "Small Explosion", "Bullet Casing", "Button Click", "Ominous", "GunCock", "Shards Expelled", "Shards Absorbed", "Shard Float", "Fami Transform", "Scope Squish", "Scope Splat", "Famira Roar", "2083 Shoot", "Laser Ready", "Famira Breath", "Critical Heat", "Famira Die", "Collected Shard", "Missed Shard", "Final Score", "Revolution 2083", "Shard Get", "Good Job!", "Great Job!", "Victory", "Wonderful!", "Come Here", "Help Me", "Agh!", "Fuck!", "Shit...", "Take This", "Fami's Grand Plan", "Debug M", "Spaghetti", "Sword", "Egg Collect", "Talking", "Fami Grumble", "Segz", "Mech Creak", "Mech Step 1", "Mech Step 2", "Mech Walking", "Mech Duck", "Mech Unduck", "Resolve", "Robolution 2083", "Scarletution 2083", "Dogolution 2083", "Classic Good Job", "Good Job - Scarlett", "Good Job - Dog", "Great Job - Scarlett", "Great Job - Dog", "Classic Wonderful", "Wonderful - Scarlett", "Wonderful - Dog", "Fucking Cop...", "Goddammit...", "Motherfucker...", "Intro Voiceover" ] sounds = [ ExtResource( 7 ), ExtResource( 10 ), ExtResource( 25 ), ExtResource( 34 ), ExtResource( 8 ), ExtResource( 42 ), ExtResource( 41 ), ExtResource( 32 ), ExtResource( 30 ), ExtResource( 117 ), ExtResource( 118 ), ExtResource( 113 ), ExtResource( 35 ), ExtResource( 6 ), ExtResource( 9 ), ExtResource( 43 ), ExtResource( 33 ), ExtResource( 51 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 24 ), ExtResource( 36 ), ExtResource( 85 ), ExtResource( 116 ), ExtResource( 39 ), ExtResource( 77 ), ExtResource( 52 ), ExtResource( 50 ), ExtResource( 47 ), ExtResource( 49 ), ExtResource( 48 ), ExtResource( 38 ), ExtResource( 29 ), ExtResource( 55 ), ExtResource( 40 ), ExtResource( 57 ), ExtResource( 58 ), ExtResource( 114 ), ExtResource( 53 ), ExtResource( 54 ), ExtResource( 56 ), ExtResource( 59 ), ExtResource( 82 ), ExtResource( 83 ), ExtResource( 72 ), ExtResource( 95 ), ExtResource( 64 ), ExtResource( 66 ), ExtResource( 61 ), ExtResource( 65 ), ExtResource( 74 ), ExtResource( 128 ), ExtResource( 62 ), ExtResource( 60 ), ExtResource( 127 ), ExtResource( 76 ), ExtResource( 69 ), ExtResource( 68 ), ExtResource( 63 ), ExtResource( 70 ), ExtResource( 71 ), ExtResource( 67 ), ExtResource( 73 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 78 ), ExtResource( 87 ), ExtResource( 92 ), ExtResource( 81 ), ExtResource( 75 ), ExtResource( 88 ), ExtResource( 86 ), ExtResource( 94 ), ExtResource( 93 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 91 ), ExtResource( 105 ), ExtResource( 108 ), ExtResource( 107 ), ExtResource( 111 ), ExtResource( 96 ), ExtResource( 97 ), ExtResource( 100 ), ExtResource( 99 ), ExtResource( 110 ), ExtResource( 127 ), ExtResource( 112 ), ExtResource( 103 ), ExtResource( 102 ), ExtResource( 104 ), ExtResource( 115 ) ] categories = [ { "color": Color( 0.690196, 0.690196, 0.690196, 1 ), diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 1f59323..57d919d 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -36,6 +36,7 @@ shader_param/uv_transform = Transform2D( 0, 1, 1, 0, 0, 0 ) shader = ExtResource( 11 ) shader_param/animate_noise = true shader_param/noise_intensity = 1.0 +shader_param/fps = 60.0 [sub_resource type="Curve" id=4] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.130639, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.348684, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]