Skip to content

Commit

Permalink
Update Bucket
Browse files Browse the repository at this point in the history
  • Loading branch information
@LittleYang0531
LittleYang0531 committed Jan 19, 2024
1 parent 9c1c361 commit 9d2ec1f
Show file tree
Hide file tree
Showing 17 changed files with 373 additions and 15 deletions.
Binary file modified dist/EngineConfiguration
View file
Binary file not shown.
Binary file modified dist/EngineData
View file
Binary file not shown.
347 changes: 347 additions & 0 deletions engine/buckets.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,347 @@
using namespace std;

class Buckets {
public:

int NormalNote = 0;
int CriticalNote = 1;
int FlickNote = 2;
int HoldStart = 3;
int CriticalHoldStart = 4;
// int NormalHoldEighth = 5;
int HoldEnd = 5;
int Sound = 6;
int ScratchHoldStart = 7;
int ScratchCriticalHoldStart = 8;
// int ScratchHoldEighth = 10;
int ScratchHoldEnd = 9;
int ScratchSound = 10;
}Buckets;

auto bucket = defineBuckets<class Buckets>({
{
sprites: {
{
id: Sprites.NormalNote,
x: 0,
y: 0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.CriticalNote,
x: 0,
y: 0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.ScratchNote,
x: -0.35,
y: 0,
w: 2.0,
h: 1.0,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: 0.8,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: 0.6,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: 0.4,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: 0.2,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: -0.8,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: -0.6,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: -0.4,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 0.25,
y: -0.2,
w: 0.4,
h: 1.2,
rotation: 90
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Hold,
x: 0.25,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.HoldNote,
x: -2.75,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Hold,
x: 0.25,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.CriticalNote,
x: -2.75,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
// sprites: {
// {
// id: Sprites.Hold,
// x: 0.0,
// y: 0.0,
// w: 1.8,
// h: 6.0,
// rotation: 270
// }
// },
// unit: UnitText.Millisecond
// }, {
sprites: {
{
id: Sprites.Hold,
x: -0.25,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.HoldNote,
x: 2.75,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Hold,
x: 0.0,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.TouchTick,
x: 0.0,
y: 0.0,
w: 1.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Scratch,
x: 0.25,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.ScratchNote,
x: -2.75,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Scratch,
x: 0.25,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.CriticalNote,
x: -2.75,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}, {
// sprites: {
// {
// id: Sprites.Scratch,
// x: 0.0,
// y: 0.0,
// w: 1.8,
// h: 6.0,
// rotation: 270
// }
// },
// unit: UnitText.Millisecond
// }, {
sprites: {
{
id: Sprites.Scratch,
x: -0.6,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.ScratchNote,
x: 2.4,
y: 0.0,
w: 2.0,
h: 1.0,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: 0.8,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: 0.6,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: 0.4,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: 0.2,
w: 0.4,
h: 1.2,
rotation: 270
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: -0.8,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: -0.6,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: -0.4,
w: 0.4,
h: 1.2,
rotation: 90
}, {
id: Sprites.ScratchArrow,
x: 3.0,
y: -0.2,
w: 0.4,
h: 1.2,
rotation: 90
}
},
unit: UnitText.Millisecond
}, {
sprites: {
{
id: Sprites.Scratch,
x: 0.0,
y: 0.0,
w: 1.8,
h: 6.0,
rotation: 270
}, {
id: Sprites.TouchScratchTick,
x: 0.0,
y: 0.0,
w: 1.0,
h: 1.0,
rotation: 270
}
},
unit: UnitText.Millisecond
}
});
2 changes: 1 addition & 1 deletion engine/engine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ using namespace watchData;
#include"skins.cpp"
#include"effects.cpp"
#include"particles.cpp"
// #include"data/buckets.cpp"
#include"buckets.cpp"
#include"constants.cpp"
#include"types.cpp"
#include"utils.cpp"
Expand Down
1 change: 1 addition & 0 deletions engine/play/FlickNote.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class FlickNote : public Archetype {
IF (t != -1 && t != inputTimeMax) res = 1, res2 = 1; FI
EntityInput.set(0, res2);
EntityInput.set(1, t - beat);
EntityInput.set(2, Buckets.FlickNote);
EntityInput.set(3, t - beat);
IF (res2 == 1) Play(Clips.Scratch, minSFXDistance); FI
IF (res2 == 2) Play(Clips.CriticalGood, minSFXDistance); FI
Expand Down
Loading

0 comments on commit 9d2ec1f

Please sign in to comment.