"Fix" Buggy Marcher Resizeables, HD Assets

Attempts to fix the weird resizeables, at the expense of inputs now may being weird. Added HD Asset Redraws
This commit is contained in:
Amy54Desu 2022-12-06 20:46:15 -05:00
parent fb0b51dea8
commit 0bda2265eb
5 changed files with 212 additions and 34 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 KiB

View file

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 9c6e532a43ac0d14bb3617bf599c8171
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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: 2
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
cookieLightType: 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
- serializedVersion: 3
buildTarget: Standalone
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:

View file

@ -26,14 +26,14 @@ namespace HeavenStudio.Games.Loaders
{
new GameAction("bop", "Bop")
{
function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.Bop(e.beat, e.length); },
function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.BopAction(e.beat, e.length); },
defaultLength = 1f,
resizable = true
},
new GameAction("marching", "Cadets March")
{
function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.CadetsMarch(e.beat, e.length); },
function = delegate { var e = eventCaller.currentEntity; MarchingOrders.instance.MarchAction(e.beat, e.length); },
defaultLength = 4f,
resizable = true
},
@ -105,10 +105,11 @@ namespace HeavenStudio.Games
private int marchOtherCount;
private int marchPlayerCount;
private int turnLength;
private bool marchSuru;
private bool beatSuru;
// private bool marchSuru;
// private bool beatSuru;
private float marchTsugi;
private float beatTsugi;
private float steamTime;
private string fastTurn;
@ -190,13 +191,21 @@ namespace HeavenStudio.Games
var cond = Conductor.instance;
var currBeat = cond.songPositionInBeats;
if (marchSuru && (int) currBeat <= marching.length)
if (cond.ReportBeat(ref marching.lastReportedBeat, marching.startBeat % 1))
{
CadetsMarch(marchTsugi + (int) currBeat, marching.length);
if (currBeat >= marching.startBeat && currBeat < marching.startBeat + marching.length)
{
CadetsMarch(marchTsugi + (int)currBeat, marching.length);
}
//else
//marchSuru = false;
}
if (beatSuru && (int) currBeat <= bop.length)
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
{
Bop(beatTsugi + (int) currBeat, bop.length);
if (currBeat >= bop.startBeat && currBeat < bop.startBeat + bop.length)
{
Bop(beatTsugi + (int)currBeat, bop.length);
}
}
if (PlayerInput.Pressed() && !IsExpectingInputNow())
{
@ -224,10 +233,8 @@ namespace HeavenStudio.Games
public void Bop(float beat, float length)
{
bop.length = length;
bop.startBeat = beat;
beatSuru = true;
beatTsugi += 1f;
// beatSuru = true;
beatTsugi += 0f;
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
@ -238,13 +245,17 @@ namespace HeavenStudio.Games
});
}
public void BopAction(float beat, float length)
{
bop.length = length;
bop.startBeat = beat;
}
public void CadetsMarch(float beat, float length)
{
marching.length = length;
marching.startBeat = beat;
marchOtherCount += 1;
marchSuru = true;
marchTsugi += 1f;
// marchSuru = true;
marchTsugi += 0f;
var marchOtherAnim = (marchOtherCount % 2 != 0 ? "MarchR" : "MarchL");
BeatAction.New(gameObject, new List<BeatAction.Action>()
@ -256,6 +267,12 @@ namespace HeavenStudio.Games
});
}
public void MarchAction(float beat, float length)
{
marching.length = length;
marching.startBeat = beat;
}
public void SargeAttention(float beat)
{
MultiSound.Play(new MultiSound.Sound[] {

File diff suppressed because one or more lines are too long