From 8fbdaaaaae21d8e6f9e35a0338354f40b0b73dfe Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Sat, 21 Aug 2021 23:31:55 +0200
Subject: [PATCH] add outer rotating platforms

---
 CMakeLists.txt              |   5 +++++
 assets-cg/font.png          | Bin 960 -> 994 bytes
 assets-cg/level/level21.txt |   2 +-
 converters.py               |  25 +++++++++++++++----------
 src/duet.h                  |   3 ++-
 src/main.c                  |   5 +++--
 src/physics.c               |  12 ++++++++++++
 7 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 785c2b1..b89142a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,11 @@ set(ASSETS
   assets-cg/level/level15.txt
   assets-cg/level/level16.txt
   assets-cg/level/level17.txt
+  assets-cg/level/level18.txt
+  assets-cg/level/level19.txt
+  assets-cg/level/level20.txt
+  assets-cg/level/level21.txt
+  assets-cg/level/level22.txt
 )
 
 fxconv_declare_converters(converters.py)
diff --git a/assets-cg/font.png b/assets-cg/font.png
index c1ea9872444d9a0ffdb240b8aa482c87487791cf..cb8cf89de82700034f0d68feba207d958e300a01 100644
GIT binary patch
delta 905
zcmV;419tqt2jT~iLI)KTE;WC5{E<m0e_TmKK~#9!?Va6{gCGor)!`NUlzqtVMW+ty
zPY3}7<9DuhD~*_(gkXTqpU-Ck;D_azk3G*bwucY^LY#yL21*D4bl!rm03rl{5CB2|
z2mwkF;(y-n_xkti^+G#$pB@_|Fw5{v2!;&U03kqKA~IwEA_RaC073u=0U!i`e-Hpd
z00;pf1b`3#LI4N>AOwIA073u=0X!q*exYz_*ShU`FJ!YLJK5l{&1LYqK{WJI;-Nz0
zPm&F80n57Q8jGzp$~<(=#n4yV;R>5RCFPiJ1oY<kBGz-y9D?PXO?4}{li-|-!NoiJ
z?)(EL_mD#nRIU#axf%<(4vM0Ee{&+}sj!jTW#^&GX~j@jE@rD<ahwFzF1r+L5qfp*
z(AaS=lMTj9DK@&c_3(nnJhKH}2s#ZJ073u=0U!i`5D&$E{^svZT~N;VvXpfuL2h%X
zTqZ$%2obB^{6<KYu=#M`ro02!yki)@pOuG<@?xe&0<KRE;Q=exAGCz7e^J${$~#?f
z9U<f@LsnjSCLy`X??yqwE1^S0m-U@(kwa8YDp_1}*BqjCIz|pLGKlSfX(xaX073u=
z0fr((-HBz1w83|GDf`yt5gbN{bsKAUQ{C~^3qytlO19l`N}spcSF_hvZjh8vE??OP
z!GkrOtQ8>)Q6%pCVL#(bf4Qm-Hn%vdR;-^V*T~2X1XBs}Cq?B+e~YPoQN}EPJ*eYM
z8(FG09vGsD5Uc2YIb(k&fuJ3kZIg8sPx2O5#`zMqCBLZOCb`k1akFp7^C3KCz5{lQ
z^C7xD$e5g1>bmKA>2MA0X2<cNj)Ys(UF_K?*yzP}JcwtbhuBiVe;`75lJ%01@d>^j
ze?7?w^U`qn77vLNXO?<&`MZ%Z$`>Q{)X8HB!8$(=N#(=cmk0swFv|cC0zin~V?2Nm
zU?f767moE3gi7Ni)*<CsB7dU!TfU@h;Ah&YEMDu6Sr@Jf8-khmj51^>i`Rm|^tNn$
z80Tbt_2hoT|3Ep!cURZFR={p7Em&O+RK6LrTyK^Aueh|cx_PGa*x&P64$~#Mcx~2H
zMHSmb#jbxA21fXum{F2SW%1gqDNXTO=tEWszG*OboctOWlrk6assUb1f%72)=+hUk
f0g|^s;2-_~h~dj#`IPT900000NkvXXu0mjfU|^u>

delta 871
zcmV-t1DO2c2fzoALI)Hx5m+9AlaWa%e>zD-K~#9!?VVk+gCGorwZj&>$}Y0^!KuSV
z2;oP;_?@R#X~g6Z0s*>yzuyIbA70OV?R8zTJ%j)dBH<qBC?N#UwHDe6z(W8C0U!i`
z5TF&#|MK~K_RsJ48|~bEcw8ZYQHEtg&}F~|2m$&MkuC$^ApnE`5CT9503iT`e*h2y
zKnMUK0E7S#0ze1=ApnE`5CT95U>UCT2aQX+_HEZkA;FI9Y=LN*%V2ebs2ioks6zcK
z*#ft~5Z-JpC#%d3UB)K2?r?>mPFXqC4+3|MAz03Ns&4C=)2pJ14{W>Z518CS41rU*
z-bs{d%#}7!6m6RmPEUnE?vR~_e+(<^1eHPLkyRWgK@Ev6-Kfe%jqO)GTVT$RA~3-H
zCQfLDV3v6Z03iT`01yH|h)3W!ezP}I=al2UB4wo{$Yr9+We_xm5WecGXM|)4!Np^l
z_6l4x$1s0AJ9ioF$xMv|nm#dv1?*gZ&=R_nvQ~GW(|ueFA!iwi;>whSf4WtElSdNv
zgUS|78IHDyAvy<@EUvk03~_ciMhr1C@a=$MCx8$DLI4N>rXob&fn|%d$#-`t>o(*S
z40?!dTC6>ZKbxr_#Jn&(RxjJ^tJ!NS7syIzm#?gY(9kuN9N07Zm5<ibzg4PgSJy03
z*^2#oc8!c&Krodce^F$ffAo)7&QHoz%ij;`NNJ-;)&AYi9%2`LOlKSq3=y;=vu&we
z#gl!+mEA!L+p<5@Z<7o(S-IJF;Q0`iBHsxs#`zG#USv*Ay!tlN{Z@1hZLs@0sw3eM
zeHVKUcQykL;tBNNTgp|45Z+|JB}9BeTlasS<wW(;aQP7r@e?Uae?2<=&B`t&reK4u
zpt9pQ1vbR>gI)k#27nOYri5U%K7;^M5~4kEtd}5U8W%ASDf<%nisrL?OIg6quv3}5
zmhG)cJul*hU<N+3bQ#LzwO}y4Ezhue>0!CDkY`f!(imdX^{5rFfu#kj%Z|!6V_w%=
zWy49F=whvwKMpcQRS0GBx>{3Xmm&sDKjj8y_@9_rf=Xrbx>{43<h4+Tq7?k8&fIYD
xTe+Z=v4B+#Ffj$vT?WvHFIF8Svq0b<{s0;9o?_ZFs4V~h002ovPDHLkV1f{viB13j

diff --git a/assets-cg/level/level21.txt b/assets-cg/level/level21.txt
index 811d19c..d0c5f1c 100644
--- a/assets-cg/level/level21.txt
+++ b/assets-cg/level/level21.txt
@@ -1,4 +1,4 @@
-#To Try to invites failure.
+#To try invites failure.
 left
 
 left
diff --git a/converters.py b/converters.py
index c7222e3..dbb9bfe 100644
--- a/converters.py
+++ b/converters.py
@@ -13,7 +13,6 @@ def convert_level(input, output, params, target):
         lines = [tempo.split(",") for tempo in raw if not tempo.startswith("#")]
         messages = [l[1:].strip() for l in raw if l.startswith("#")]
         message = "\n".join(l.replace("\\n", "\n") for l in messages)
-        print(message)
 
     blocks = bytes()
     block_count = 0
@@ -21,7 +20,6 @@ def convert_level(input, output, params, target):
     for (tempo, rects) in enumerate(lines):
         for r in [r for r in rects if r]:
             r = r.strip().split()
-            print(tempo, r)
             shape, action, position = -1, 0, -1
 
             # Shape
@@ -40,6 +38,14 @@ def convert_level(input, output, params, target):
             if "long_vertical" in r:
                 shape = 7
 
+            # Position
+            if "left" in r:
+                position = 0
+            if "right" in r:
+                position = 1
+            if "middle" in r:
+                position = 2
+
             # Action
             if "rotate_left" in r:
                 action = 1
@@ -59,20 +65,19 @@ def convert_level(input, output, params, target):
                 action = 8
             if "fast_3" in r:
                 action = 9
-
-            # Position
-            if "left" in r:
-                position = 0
-            if "right" in r:
-                position = 1
-            if "middle" in r:
-                position = 2
+            if "rotate" in r and position == 0:
+                action = 6
+            if "rotate" in r and position == 1:
+                action = 5
 
             # Implicit rules
 
             # Rotating in the middle -> long
             if shape < 0 and position == 2 and action in [1, 2]:
                 shape = 5
+            # Rotating on the side -> huge
+            if shape < 0 and position in [0, 1] and action in [5, 6]:
+                shape = 6
             # In the middle -> medium
             if shape < 0 and position == 2:
                 shape = 3
diff --git a/src/duet.h b/src/duet.h
index 0fa986a..98ad8d2 100644
--- a/src/duet.h
+++ b/src/duet.h
@@ -140,7 +140,8 @@ extern level_t  level1,  level2,  level3,  level4;
 extern level_t  level5,  level6,  level7,  level8;
 extern level_t  level9, level10, level11, level12;
 extern level_t level13, level14, level15, level16;
-extern level_t level17;
+extern level_t level17, level18, level19, level20;
+extern level_t level21, level22;
 
 //---
 // Menu
diff --git a/src/main.c b/src/main.c
index 830cb8c..44bdba7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,12 +54,13 @@ int main(void)
     level_t const *story_levels[] = {
         &level1,  &level2,  &level3,  &level4,  &level5,  &level6,  &level7,
         &level8,  &level9,  &level10, &level11, &level12, &level13, &level14,
-        &level15, &level16, &level17,
+        &level15, &level16, &level17, &level18, &level19, &level20, &level21,
+        &level22,
         NULL,
     };
     int story_position = main_menu();
 
-    story_position = 11;
+    story_position = 16;
 
     game_t game;
     memset(&game, 0x00, sizeof game);
diff --git a/src/physics.c b/src/physics.c
index 5ffdeaf..c5bf6c3 100644
--- a/src/physics.c
+++ b/src/physics.c
@@ -97,12 +97,16 @@ void rect_load(rect_t *r, rectmeta_t const *meta)
     case Position_Left:
         if(meta->shape == Shape_Square)
             r->y = DHEIGHT/2 - 0.22*CORRIDOR_SIZE;
+        else if(meta->shape == Shape_HugeBar)
+            r->y = DHEIGHT/2 - 0.38*CORRIDOR_SIZE;
         else
             r->y = DHEIGHT/2 - CORRIDOR_SIZE/2 + r->h/2;
         break;
     case Position_Right:
         if(meta->shape == Shape_Square)
             r->y = DHEIGHT/2 + 0.22*CORRIDOR_SIZE;
+        else if(meta->shape == Shape_HugeBar)
+            r->y = DHEIGHT/2 + 0.38*CORRIDOR_SIZE;
         else
             r->y = DHEIGHT/2 + CORRIDOR_SIZE/2 - r->h/2;
         break;
@@ -132,4 +136,12 @@ void rect_physics(rect_t *r, rectmeta_t const *meta, float absolute_time)
         float speeding_period = fminf(2.0, fmaxf(0.0, time + 6.0));
         r->x -= RECT_SPEED * speeding_period;
     }
+    else if(meta->action == Action_OuterRotateLeft) {
+        float vr = 0.7; /* rad/tempo */
+        r->r = time * vr;
+    }
+    else if(meta->action == Action_OuterRotateRight) {
+        float vr = 0.7; /* rad/tempo */
+        r->r = -time * vr;
+    }
 }