1
1
// look this is the first header file ive ever created
2
2
3
3
4
+ #include < iostream>
4
5
int notesHit = 0 ;
5
6
int notesMissed = 0 ;
6
7
int perfectHit = 0 ;
@@ -25,41 +26,43 @@ float overdriveFill = 0.0f;
25
26
float overdriveActiveFill=0 .0f ;
26
27
double overdriveActiveTime = 0.0 ;
27
28
29
+ float uvOffsetX = 0 ;
30
+ float uvOffsetY = 0 ;
31
+
28
32
int stars () {
29
- int baseScore = notes * 30 ;
33
+ int baseScore = 1080 + 720 + 360 +(( notes- 30 ) * 144 ) ;
30
34
31
35
float starPercent = (float )score/(float )baseScore;
32
-
33
36
if (starPercent < xStarThreshold[0 ]) {return 0 ;}
34
- else if (starPercent < xStarThreshold[1 ]) {return 1 ;}
37
+ else if (starPercent < xStarThreshold[1 ]) { return 1 ; }
35
38
else if (starPercent < xStarThreshold[2 ]) {return 2 ;}
36
39
else if (starPercent < xStarThreshold[3 ]) {return 3 ;}
37
40
else if (starPercent < xStarThreshold[4 ]) {return 4 ;}
38
41
else if (starPercent < xStarThreshold[5 ]) {return 5 ;}
39
- else if (starPercent > xStarThreshold[5 ]) {goldStars = true ;}
42
+ else if (starPercent >= xStarThreshold[5 ]) { goldStars = true ; return 5 ; }
40
43
else return 5 ;
41
44
42
45
return 0 ;
43
46
}
44
47
45
48
int multiplier (int instrument) {
46
49
int od = overdrive ? 2 : 1 ;
47
-
50
+
48
51
if (instrument == 1 || instrument == 3 ){
49
52
50
- if (combo < 10 ) { return 1 * od; }
51
- else if (combo < 20 ) { return 2 * od; }
52
- else if (combo < 30 ) { return 3 * od; }
53
- else if (combo < 40 ) { return 4 * od; }
54
- else if (combo < 50 ) { return 5 * od; }
55
- else if (combo >= 50 ) { return 6 * od; }
53
+ if (combo < 10 ) { uvOffsetX = 0 ; uvOffsetY = 0 + (overdrive ? 0 . 5f : 0 ); return 1 * od; }
54
+ else if (combo < 20 ) { uvOffsetX = 0 . 25f ; uvOffsetY = 0 + (overdrive ? 0 . 5f : 0 ); return 2 * od; }
55
+ else if (combo < 30 ) { uvOffsetX = 0 . 5f ; uvOffsetY = 0 + (overdrive ? 0 . 5f : 0 ); return 3 * od; }
56
+ else if (combo < 40 ) { uvOffsetX = 0 . 75f ; uvOffsetY = 0 + (overdrive ? 0 . 5f : 0 ); return 4 * od; }
57
+ else if (combo < 50 ) { uvOffsetX = 0 ; uvOffsetY = 0 . 25f + (overdrive ? 0 . 5f : 0 ); return 5 * od; }
58
+ else if (combo >= 50 ) { uvOffsetX = 0 . 25f ; uvOffsetY = 0 . 25f + (overdrive ? 0 . 5f : 0 ); return 6 * od; }
56
59
else { return 1 * od; };
57
60
}
58
61
else {
59
- if (combo < 10 ) { return 1 * od; }
60
- else if (combo < 20 ) { return 2 * od; }
61
- else if (combo < 30 ) { return 3 * od; }
62
- else if (combo >= 30 ) { return 4 * od; }
62
+ if (combo < 10 ) { uvOffsetX = 0 ; uvOffsetY = 0 + (overdrive ? 0.5 : 0 ); return 1 * od; }
63
+ else if (combo < 20 ) { uvOffsetX = 0 . 25f ; uvOffsetY = 0 + (overdrive ? 0.5 : 0 ); return 2 * od; }
64
+ else if (combo < 30 ) { uvOffsetX = 0 . 5f ; uvOffsetY = 0 + (overdrive ? 0.5 : 0 ); return 3 * od; }
65
+ else if (combo >= 30 ) { uvOffsetX = 0 . 75f ; uvOffsetY = 0 + (overdrive ? 0.5 : 0 ); return 4 * od; }
63
66
else { return 1 * od; }
64
67
};
65
68
}
@@ -73,12 +76,9 @@ int maxMultForMeter(int instrument) {
73
76
74
77
float comboFillCalc (int instrument) {
75
78
if (instrument == 0 || instrument == 2 ) {
76
- // conversation mbr
77
- // shouldve been 0 and 2 :sob:
78
- // also also it stops at the max combo, it doesnt do it one more time
79
- // For instruments 2 and 4, limit the float value to 0.0 to 0.4
79
+ // For instruments 0 and 2, limit the float value to 0.0 to 0.4
80
80
if (combo >= 30 ) {
81
- return 1 .0f ; // If combo is 40 or more, set float value to 1.0
81
+ return 1 .0f ; // If combo is 30 or more, set float value to 1.0
82
82
}
83
83
else {
84
84
return static_cast <float >(combo % 10 ) / 10 .0f ; // Float value from 0.0 to 0.9 every 10 notes
@@ -87,7 +87,7 @@ float comboFillCalc(int instrument) {
87
87
else {
88
88
// For instruments 1 and 3, limit the float value to 0.0 to 0.6
89
89
if (combo >= 50 ) {
90
- return 1 .0f ; // If combo is 60 or more, set float value to 1.0
90
+ return 1 .0f ; // If combo is 50 or more, set float value to 1.0
91
91
}
92
92
else {
93
93
return static_cast <float >(combo % 10 ) / 10 .0f ; // Float value from 0.0 to 0.9 every 10 notes
0 commit comments