mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Nail Carpenter Swing Support (#829)

Browse source 
* BurstLinq

make BGM resync when changing pitch (to test)

* autoswing

some game implementations, most games already work fine

* more game tweaks

* 16th note swing

more game fixes
make pitch change resync optional in the API

* suppress some common warnings

* Update Credits.txt

* nail carpenter swing support
This commit is contained in:
minenice55 2024-04-07 00:56:37 -04:00 committed by GitHub
parent d32f5591d2
commit 45a4b6d6b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Resources/Games/powerCalligraphy.prefab.meta
View file

@ -3,5 +3,5 @@ guid: 3ca4cc3a8f8bda94cb89a0b7ff76e9d7
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: ctrbear/common assetBundleName: agbcalligraphy/common
assetBundleVariant: assetBundleVariant:

2
Assets/Resources/Games/sickBeats.prefab.meta
View file

@ -3,5 +3,5 @@ guid: 6d72fff7cc3bd794db624e2bc63f9856
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: ctrbear/common assetBundleName: agbsickbeats/common
assetBundleVariant: assetBundleVariant:

3
Assets/Scripts/Games/NailCarpenter/LongNail.cs
View file

@ -24,6 +24,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
{ {
game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_RegPress, WeakHammmerJust, null, null); game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_RegPress, WeakHammmerJust, null, null);
} }
targetBeat = Conductor.instance.GetUnSwungBeat(targetBeat);
Update(); Update();
} }
@ -69,7 +70,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeatsAsDouble;
Vector3 pos = transform.position; Vector3 pos = transform.position;
pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond); pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond);
transform.position = pos; transform.position = pos;

3
Assets/Scripts/Games/NailCarpenter/Nail.cs
View file

@ -24,6 +24,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
{ {
game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_AltPress, StrongHammmerJust, null, null); game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_AltPress, StrongHammmerJust, null, null);
} }
targetBeat = Conductor.instance.GetUnSwungBeat(targetBeat);
Update(); Update();
} }
@ -67,7 +68,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeatsAsDouble;
Vector3 pos = transform.position; Vector3 pos = transform.position;
pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond); pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond);
transform.position = pos; transform.position = pos;

6
Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
View file

@ -214,7 +214,7 @@ namespace HeavenStudio.Games
void Update() void Update()
{ {
var currentBeat = conductor.songPositionInBeatsAsDouble; double currentBeat = conductor.unswungSongPositionInBeatsAsDouble;
if (!conductor.isPlaying) return; if (!conductor.isPlaying) return;
@ -234,8 +234,8 @@ namespace HeavenStudio.Games
} }
// Board scroll. // Board scroll.
var boardPos = boardTrans.localPosition; Vector3 boardPos = boardTrans.localPosition;
var newBoardX = currentBeat * scrollMetresPerBeat; double newBoardX = currentBeat * scrollMetresPerBeat;
newBoardX %= boardWidth; newBoardX %= boardWidth;
boardTrans.localPosition = new Vector3((float)newBoardX, boardPos.y, boardPos.z); boardTrans.localPosition = new Vector3((float)newBoardX, boardPos.y, boardPos.z);

3
Assets/Scripts/Games/NailCarpenter/Sweet.cs
View file

@ -34,6 +34,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
AwakeAnim(); AwakeAnim();
game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_SweetsHit, HammmerJust, null, null); game.ScheduleUserInput(targetBeat, 0, NailCarpenter.InputAction_SweetsHit, HammmerJust, null, null);
targetBeat = Conductor.instance.GetUnSwungBeat(targetBeat);
Update(); Update();
if (sweetType == sweetsType.Pudding) if (sweetType == sweetsType.Pudding)
@ -109,7 +110,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
double beat = cond.songPositionInBeats; double beat = cond.unswungSongPositionInBeatsAsDouble;
Vector3 pos = transform.position; Vector3 pos = transform.position;
pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond); pos.x = targetX + (float)((beat - targetBeat) * metresPerSecond);
transform.position = pos; transform.position = pos;