From 188de3de56de1428f78e3bf5adbcb74d573191eb Mon Sep 17 00:00:00 2001 From: saladplainzone <31338325+saladplainzone@users.noreply.github.com> Date: Thu, 2 Mar 2023 20:23:56 -0800 Subject: [PATCH] Space Dance - Polish (#324) * Sneaky Spirits - Fix Easing gost go woosh * Sneaky Spirits - Tree Tweaks Stops during slowdown now and realigned second animation frame * Space Dance - Polish Added new Hi-Res effect textures, adjusted sound offsets --- .../Sprites/Games/SpaceDance/BG R3.png.meta | 96 +++++++++++++++++++ ...hardy_Remacri.png.meta => Effect.png.meta} | 68 ++++++------- Assets/Scripts/Games/SpaceDance/SpaceDance.cs | 35 ++++--- 3 files changed, 146 insertions(+), 53 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/SpaceDance/BG R3.png.meta rename Assets/Resources/Sprites/Games/SpaceDance/{spacedance_eff-4x_foolhardy_Remacri.png.meta => Effect.png.meta} (90%) diff --git a/Assets/Resources/Sprites/Games/SpaceDance/BG R3.png.meta b/Assets/Resources/Sprites/Games/SpaceDance/BG R3.png.meta new file mode 100644 index 00000000..c96d60b2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SpaceDance/BG R3.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e3dd5153abda259459f302d1cfef208d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SpaceDance/spacedance_eff-4x_foolhardy_Remacri.png.meta b/Assets/Resources/Sprites/Games/SpaceDance/Effect.png.meta similarity index 90% rename from Assets/Resources/Sprites/Games/SpaceDance/spacedance_eff-4x_foolhardy_Remacri.png.meta rename to Assets/Resources/Sprites/Games/SpaceDance/Effect.png.meta index 1e2efbec..93265c6d 100644 --- a/Assets/Resources/Sprites/Games/SpaceDance/spacedance_eff-4x_foolhardy_Remacri.png.meta +++ b/Assets/Resources/Sprites/Games/SpaceDance/Effect.png.meta @@ -115,12 +115,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_0 rect: serializedVersion: 2 - x: 486 - y: 358 - width: 220 - height: 220 + x: 13 + y: 283 + width: 216 + height: 216 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -136,12 +136,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_1 rect: serializedVersion: 2 - x: 780 - y: 364 - width: 208 - height: 208 + x: 249 + y: 293 + width: 202 + height: 202 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -157,12 +157,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_2 rect: serializedVersion: 2 - x: 1080 - y: 376 - width: 184 - height: 184 + x: 483 + y: 316 + width: 170 + height: 172 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -178,12 +178,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_3 rect: serializedVersion: 2 - x: 131 - y: 131 - width: 66 - height: 66 + x: 23 + y: 178 + width: 70 + height: 68 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -199,12 +199,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_4 rect: serializedVersion: 2 - x: 372 - y: 52 - width: 224 - height: 224 + x: 127 + y: 21 + width: 228 + height: 228 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -220,12 +220,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_5 rect: serializedVersion: 2 - x: 751 - y: 111 - width: 106 - height: 106 + x: 379 + y: 143 + width: 114 + height: 114 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -241,12 +241,12 @@ TextureImporter: name: spacedance_eff-4x_foolhardy_Remacri_6 rect: serializedVersion: 2 - x: 1082 - y: 120 - width: 84 + x: 507 + y: 171 + width: 88 height: 88 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs index 8375f47c..1649c9eb 100644 --- a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs +++ b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs @@ -177,20 +177,17 @@ namespace HeavenStudio.Games { Jukebox.PlayOneShotGame("spaceDance/inputBad"); DancerP.DoScaledAnimationAsync("PunchDo", 0.5f); - Gramps.DoScaledAnimationAsync("GrampsOhFuck", 0.5f); // Look at this later, sound effect has some weird clipping on it sometimes?? popping. like. fucking popopop idk why its doing that its fine theres no sample weirdness ughh } if (PlayerInput.GetSpecificDirectionDown(1) && !IsExpectingInputNow(InputType.DIRECTION_RIGHT_DOWN)) { DancerP.DoScaledAnimationAsync("TurnRightDo", 0.5f); Jukebox.PlayOneShotGame("spaceDance/inputBad"); - Gramps.DoScaledAnimationAsync("GrampsOhFuck", 0.5f); } if (PlayerInput.GetSpecificDirectionDown(2) && !IsExpectingInputNow(InputType.DIRECTION_DOWN_DOWN)) { DancerP.DoScaledAnimationAsync("SitDownDo", 0.5f); Jukebox.PlayOneShotGame("spaceDance/inputBad"); - Gramps.DoScaledAnimationAsync("GrampsOhFuck", 0.5f); } } } @@ -221,23 +218,23 @@ namespace HeavenStudio.Games soundsToPlay.AddRange(new List() { new MultiSound.Sound("spaceDance/dancerTurn", beat), - new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f), + new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.007f), }); break; case (int)WhoSpeaks.Gramps: soundsToPlay.AddRange(new List() { new MultiSound.Sound("spaceDance/otherTurn", beat), - new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f), + new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.007f), }); break; case (int)WhoSpeaks.Both: soundsToPlay.AddRange(new List() { new MultiSound.Sound("spaceDance/dancerTurn", beat), - new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f), + new MultiSound.Sound("spaceDance/dancerRight", beat + 1.0f, 1, 1, false, 0.007f), new MultiSound.Sound("spaceDance/otherTurn", beat), - new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f), + new MultiSound.Sound("spaceDance/otherRight", beat + 1.0f, 1, 1, false, 0.007f), }); break; } @@ -281,28 +278,28 @@ namespace HeavenStudio.Games case (int)WhoSpeaks.Dancers: soundsToPlay.AddRange(new List() { - new MultiSound.Sound("spaceDance/dancerLets", beat), - new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f), - new MultiSound.Sound("spaceDance/dancerDown", beat + 1f), + new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.07f), + new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.02f), + new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.006f), }); break; case (int)WhoSpeaks.Gramps: soundsToPlay.AddRange(new List() { - new MultiSound.Sound("spaceDance/otherLets", beat), - new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.084f), - new MultiSound.Sound("spaceDance/otherDown", beat + 1f), + new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.024f), + new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.04f), + new MultiSound.Sound("spaceDance/otherDown", beat + 1f, 1, 1, false, 0.01f), }); break; case (int)WhoSpeaks.Both: soundsToPlay.AddRange(new List() { - new MultiSound.Sound("spaceDance/dancerLets", beat), - new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f), - new MultiSound.Sound("spaceDance/dancerDown", beat + 1f), - new MultiSound.Sound("spaceDance/otherLets", beat), - new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.084f), - new MultiSound.Sound("spaceDance/otherDown", beat + 1f), + new MultiSound.Sound("spaceDance/dancerLets", beat, 1, 1, false, 0.07f), + new MultiSound.Sound("spaceDance/dancerSit", beat + 0.5f, 1, 1, false, 0.02f), + new MultiSound.Sound("spaceDance/dancerDown", beat + 1f, 1, 1, false, 0.006f), + new MultiSound.Sound("spaceDance/otherLets", beat, 1, 1, false, 0.024f), + new MultiSound.Sound("spaceDance/otherSit", beat + 0.5f, 1, 1, false, 0.04f), + new MultiSound.Sound("spaceDance/otherDown", beat + 1f, 1, 1, false, 0.01f), }); break; }