Yatis-Lephe-Industries/Duet
Yatis-Lephe-Industries
/
Duet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all remaining levels (8_5 to 8_9)

This commit is contained in:
Lephenixnoir 2022-01-23 19:11:18 +01:00
parent 467cd24596
commit 0a7e4fbcab
Signed by: Lephenixnoir
GPG Key ID: 1BBA026E13FC0495
13 changed files with 77 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -64,6 +64,11 @@ set(ASSETS
assets-cg/level/level8_2.txt
assets-cg/level/level8_3.txt
assets-cg/level/level8_4.txt
assets-cg/level/level8_5.txt
assets-cg/level/level8_6.txt
assets-cg/level/level8_7.txt
assets-cg/level/level8_8.txt
assets-cg/level/level8_9.txt
)
fxconv_declare_converters(converters.py)

1
TODO
View File

@ -1,4 +1,3 @@
* Tighter than the original?
* Count number of turns, with optimal
* Add performance counters
* Check if level tempo is accounted for

BIN
assets-cg/font.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

8
assets-cg/level/level8_1.txt
View File

@ -2,16 +2,16 @@
!1.0
left
left fadeout_2
left fadeout_1
right
middle fadeout_2
middle fadeout_1
left
right fadeout_2
right fadeout_1
left
right fadeout_2
right fadeout_1

14
assets-cg/level/level8_2.txt
View File

@ -2,27 +2,27 @@
!1.1
middle
left fadeout_2
left fadeout_1
middle fadeout_2
middle fadeout_1
right fadeout_2
right fadeout_1
square left fadeout_3
square right fadeout_3
middle fadeout_2
middle fadeout_1
left fadeout_2
left fadeout_1
left fadeout_3
left fadeout_3
left fadeout_2
left fadeout_1
right fadeout_2
right fadeout_1
square left fadeout_3

6
assets-cg/level/level8_3.txt
View File

@ -2,19 +2,19 @@
!1.15
left
left fadeout_2
left fadeout_1
right fast_1 fadeout_3
left fadeout_3
right fadeout_2
right fadeout_1
left fast_1 fadeout_3
right fadeout_3
left fadeout_2
left fadeout_1
right fast_1 fadeout_3

18
assets-cg/level/level8_5.txt
View File

@ -1,22 +1,22 @@
#There is nothing to regret.
square left fadeout_3
!1.25
square left
square right fadeout_2
square left slow_1 fadeout_2
square left slow fadeout_2
square right fadeout_2
left slide fadeout_2
right slide fadeout_2
square lefti slow_1 fadeout_2
square left slow fadeout_2
square right fadeout_2
right fast_1 fadeout_2
right slow_1 fadeout_2
right fadeout_2
left fast_1 fadeout_2
small right fadeout_2
@ -24,13 +24,13 @@ small right fadeout_2
right fast_1 fadeout_2
small left fadeout_2
right slide slow_1 fadeout_2
left slide slow fadeout_2
middle fast_1 fadeout_2
left fadeout_2
middle slow_1 fadeout_2
middle slow fadeout_2
square left fast_1 fadeout_2
@ -49,5 +49,3 @@ right slide fadeout_2
middle fast_1 fadeout_2
right fadeout_2

10
assets-cg/level/level8_6.txt
View File

@ -1,5 +1,5 @@
#Anger is always temporary.
!1.30
right fast_1
right fadeout_2
@ -10,7 +10,7 @@ right fadeout_2
left fadeout_2
left slow_1
left slow fadeout_2
square left fadeout_2
@ -21,7 +21,7 @@ small left fadeout_2
middle fadeout_2
right slow_1 fadeout_2
right slow fadeout_2
right fadeout_2
@ -35,7 +35,7 @@ right fadeout_2
right fadeout_2
square right fast_2 fadeout_2
square right fast_1 fadeout_2
square left fadeout_2
@ -48,4 +48,4 @@ small left fadeout_2
right fadeout_2
right slow_1
right slow fadeout_2

16
assets-cg/level/level8_7.txt
View File

@ -1,17 +1,17 @@
#Sometimes letting go is the\nharder choice.
!1.35
square right slide
square left slide
square right slide fadeout_3
square left slide fadeout_3
square left fast_1 fadeout_2
square right fadeout_2
square right slide fadeout_2
square left slide fadeout_2
square right slide fadeout_2
square right fadeout_2
square left fadeout_2
@ -20,14 +20,14 @@ left fast_1 fadeout_2
small right fadeout_2
right fadeout_2
small left slow_1 fadeout_2
small left slow fadeout_2
right fast_1 fadeout_2
left fadeout_2
left fadeout_2
small right slow_1 fadeout_2
small right slow fadeout_2
square right slide fadeout_2
@ -47,7 +47,7 @@ right fast_1 fadeout_2
right fadeout_2
left slow_1 fadeout_2
left slow fadeout_2
left fadeout_2

22
assets-cg/level/level8_8.txt
View File

@ -1,5 +1,5 @@
#You must move forward.
!1.40
huge left outer_rotate_right
left fadeout_2
@ -8,7 +8,7 @@ left fadeout_2
left fadeout_2
right slow_1 fadeout_2
right slow fadeout_2
right fadeout_2
@ -16,21 +16,19 @@ middle fast_1 fadeout_2
right fadeout_2
square left fast_1 fadeout_2
square left fadeout_2
square right slow fadeout_2
square right fadeout_2
square left slow_1 fadeout_2
square left slow fadeout_2
square left fadeout_2
square right slow_1 fadeout_2
left fast_2 fadeout_2
left fast_1 fadeout_2
small right fadeout_2
right fadeout_2
small left slow_1 fadeout_2
small left slow fadeout_2
right fadeout_2
@ -38,7 +36,7 @@ right fast_1 fadeout_2
middle fadeout_2
left slow_1 fadeout_2
left slow fadeout_2
small right fadeout_2
square right fast_1 fadeout_2
@ -54,7 +52,7 @@ square left fadeout_2
square right fadeout_2
right slow_1 fadeout_2
right slow fadeout_2
right fadeout_2

26
assets-cg/level/level8_9.txt
View File

@ -1,10 +1,10 @@
#But I want you to know one\nlast thing...
!1.45
right fast_1
left fadeout_2
left slow_1 fadeout_2
left slow fadeout_2
left fadeout_2
@ -16,36 +16,38 @@ right fadeout_2
right fadeout_2
right slide slow_1 fadeout_2
right fadeout_2
right slide slow_1 fadeout_2
left slide slow fadeout_2
right slide slow_1 fadeout_2
left slide slow fadeout_2
left slide slow fadeout_2
square left fadeout_2
square right slow_1 fadeout_2
square right slow fadeout_2
right fadeout_2
right fadeout_2
left slow_1 fadeout_2
left slow fadeout_2
small right fadeout_2
right fast_1 fadeout_2
small left fadeout_2
right slow_1 fadeout_2
right slow fadeout_2
small left fadeout_2
square right fast_1 fadeout_2
square left fast_1 fadeout_2
square left fadeout_2
square right fadeout_2
right fadeout_2
right fast_1 fadeout_2
midddle slow_1 fadeout_2
middle slow fadeout_2
left fadeout_2
small right fadeout_2

5
src/main.c
View File

@ -75,9 +75,10 @@ episode_t episodes[] = {
},
{
.name = "acceptance",
.level_count = 4,
.level_count = 9,
.levels = (level_t *[]){
&level8_1, &level8_2, &level8_3, &level8_4
&level8_1, &level8_2, &level8_3, &level8_4, &level8_5, &level8_6,
&level8_7, &level8_8, &level8_9
},
},
};

11
src/physics.c
View File

@ -189,7 +189,7 @@ void rect_physics(rect_t *r, rectmeta_t const *meta, float absolute_time)
/* Fadeout */
if(meta->fadeout == Fadeout_2) {
if(meta->fadeout == Fadeout_1) {
/* Reduce opacity to 0 between -4 and -2.5 */
if(time > -2.5)
r->opacity = 0;
@ -198,6 +198,15 @@ void rect_physics(rect_t *r, rectmeta_t const *meta, float absolute_time)
else
r->opacity = 256;
}
if(meta->fadeout == Fadeout_2) {
/* Reduce opacity to 0 between -2.5 and -1 */
if(time > -1)
r->opacity = 0;
else if(time >= -2.5)
r->opacity = 256 * (1 - (time + 2.5) / 1.5);
else
r->opacity = 256;
}
if(meta->fadeout == Fadeout_3) {
/* Reduce opacity to 0 between -1 and 0.5 */
if(time > 0.5)