Chart progress, mostly Great Misdirect

- Mirrors: vox done - Obfuscation: imported RBN guitar/bass/vox to grinnz's tempo map - Desert of Song: vox and RS bass done
mtolly · Nov 9, 2020 · 815e41a · 815e41a
1 parent 3dee4b8
commit 815e41a
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 14 deletions.
diff --git a/haskell/src/Rocksmith/MIDI.hs b/haskell/src/Rocksmith/MIDI.hs
@@ -740,7 +740,7 @@ buildRSVocals tmap vox = Vocals $ V.fromList $ let
     Wait dt1 (VocalNote lyric pitch) (Wait dt2 VocalNoteEnd rest) -> let
       lyric1 = fromMaybe lyric $ T.stripSuffix "#" lyric <|> T.stripSuffix "^" lyric
       lyric2 = case T.stripSuffix "=" lyric1 of
-        Just x  -> x <> "-"
+        Just x  -> x <> "--"
         Nothing -> lyric1
       lyric3 = case rest of
         Wait _ VocalPhraseEnd _ -> lyric2 <> "+"

diff --git a/songs-grinnz/between-the-buried-and-me/astral-body/song.yml b/songs-grinnz/between-the-buried-and-me/astral-body/song.yml
@@ -10,7 +10,7 @@ parts:
   guitar:
     grybo: {}
 plans:
-  plan:
+  album:
     parts: {}
     song:
       concatenate:

diff --git a/songs-grinnz/between-the-buried-and-me/augment-of-rebirth/song.yml b/songs-grinnz/between-the-buried-and-me/augment-of-rebirth/song.yml
@@ -8,7 +8,7 @@ parts:
     drums:
       kicks: 2
 plans:
-  plan:
+  album:
     song:
       concatenate:
       - fade:

diff --git a/songs-grinnz/between-the-buried-and-me/desert-of-song/notes.mid b/songs-grinnz/between-the-buried-and-me/desert-of-song/notes.mid
diff --git a/songs-grinnz/between-the-buried-and-me/desert-of-song/song.yml b/songs-grinnz/between-the-buried-and-me/desert-of-song/song.yml
@@ -7,9 +7,21 @@ parts:
   drums:
     drums:
       kicks: 1
+  vocal:
+    vocal:
+      count: 3
+      gender: male
+  bass:
+    pro-guitar:
+      tuning:
+        base: bass-5
+        global: -3 # G# C# F# B E
+      tones:
+        file-tone-base: ../../../tones/SatchBoogie_bass.tone2014.xml
+        # TODO maybe a tone for the bowed notes in the beginning,
+        # and an overdrive tone for a few parts throughout
 plans:
-  plan:
-    parts: {}
+  album:
     song:
       concatenate:
       - fade:
@@ -27,3 +39,12 @@ audio:
   album-desert:
     md5: 9d91553c5ba8560e0a82cded6db8a0b2
     frames: 14704704
+targets:
+  rb3:
+    game: rb3
+  ps:
+    game: ps
+  rs:
+    game: rs
+    arrangements:
+    - [bonus-rhythm, bass]
diff --git a/songs-grinnz/between-the-buried-and-me/foam-born/notes.mid b/songs-grinnz/between-the-buried-and-me/foam-born/notes.mid
diff --git a/songs-grinnz/between-the-buried-and-me/lay-your-ghosts-to-rest/song.yml b/songs-grinnz/between-the-buried-and-me/lay-your-ghosts-to-rest/song.yml
@@ -10,7 +10,7 @@ parts:
   guitar:
     grybo: {}
 plans:
-  plan:
+  album:
     song:
       pad: [4.412, album-track]
 audio:

diff --git a/songs-grinnz/between-the-buried-and-me/lunar-wilderness/song.yml b/songs-grinnz/between-the-buried-and-me/lunar-wilderness/song.yml
@@ -8,7 +8,7 @@ parts:
     drums:
       kicks: 2
 plans:
-  plan:
+  album:
     parts: {}
     song:
       concatenate:

diff --git a/songs-grinnz/between-the-buried-and-me/mirrors/notes.mid b/songs-grinnz/between-the-buried-and-me/mirrors/notes.mid
diff --git a/songs-grinnz/between-the-buried-and-me/mirrors/song.yml b/songs-grinnz/between-the-buried-and-me/mirrors/song.yml
@@ -2,7 +2,7 @@ metadata:
   title: Mirrors
   file-include: "../../../albums/the-great-misdirect.yml"
   track-number: 1
-  author: Grinnz
+  author: Grinnz, Onyxite
 audio:
   album-track:
     md5: f7ee2d02293a31d867449932d4c4d81b
@@ -18,3 +18,12 @@ parts:
   drums:
     drums:
       kicks: 1
+  vocal:
+    vocal:
+      count: 2
+      gender: male
+targets:
+  rb3:
+    game: rb3
+  ps:
+    game: ps
diff --git a/songs-grinnz/between-the-buried-and-me/obfuscation/notes.mid b/songs-grinnz/between-the-buried-and-me/obfuscation/notes.mid
diff --git a/songs-grinnz/between-the-buried-and-me/obfuscation/song.yml b/songs-grinnz/between-the-buried-and-me/obfuscation/song.yml
@@ -2,7 +2,7 @@ metadata:
   title: Obfuscation
   file-include: "../../../albums/the-great-misdirect.yml"
   track-number: 2
-  author: Grinnz
+  author: Grinnz, Harmonix
 audio:
   album-mirrors:
     md5: f7ee2d02293a31d867449932d4c4d81b
@@ -12,24 +12,65 @@ audio:
     frames: 24490200
   hihat:
     file-path: ../../../sound/hihat-foot.wav
+  rbn-bass:
+    md5: 7a61310252cdf17e28b411fcfb4c328d
+    frames: 24692678
+  rbn-guitar:
+    md5: fc342c8968041266bafe9ab85151bee3
+    frames: 24692678
+  rbn-vocal:
+    md5: 564f9c94aa11f1ffa3dc1efb658e1efd
+    frames: 24692678
+  rbn-backing:
+    md5: fe9f07fb0d47739af25fe9182f2ba41b
+    frames: 24692678
 plans:
   album:
     countin:
+      &countin
       0|2+(2/3): hihat
       1|0: hihat
       1|1+(1/3): hihat
       1|2: hihat
       1|2+(2/3): hihat
       1|3+(1/3): hihat
     song:
+      &song
       fade:
       - start
       - 2.756
       - trim:
         - '3:32.957'
         - concatenate: [album-mirrors, album-obfuscation]
+  dev:
+    countin: *countin
+    song: *song
+    parts:
+      rbn-bass: rbn-bass
+      rbn-guitar: rbn-guitar
+      rbn-vocal: rbn-vocal
+      rbn-backing: rbn-backing
 parts:
   drums:
     drums:
       kicks: 2
+  guitar:
+    grybo: {}
+  bass:
+    grybo: {}
+  vocal:
+    vocal:
+      count: 1
+      gender: male
+targets:
+  rb3:
+    game: rb3
+    plan: album
+  rb3-2x:
+    game: rb3
+    2x-bass-pedal: true
+    plan: album
+  ps:
+    game: ps
+    plan: album
 
diff --git a/songs-grinnz/between-the-buried-and-me/specular-reflection/song.yml b/songs-grinnz/between-the-buried-and-me/specular-reflection/song.yml
@@ -10,7 +10,7 @@ parts:
   guitar:
     grybo: {}
 plans:
-  plan:
+  album:
     song:
       pad:
       - 2.821

diff --git a/songs-grinnz/between-the-buried-and-me/swim-to-the-moon/song.yml b/songs-grinnz/between-the-buried-and-me/swim-to-the-moon/song.yml
@@ -8,7 +8,7 @@ parts:
     drums:
       kicks: 2
 plans:
-  plan:
+  album:
     song:
       concatenate:
       - fade:

diff --git a/songs-grinnz/between-the-buried-and-me/telos/song.yml b/songs-grinnz/between-the-buried-and-me/telos/song.yml
@@ -8,7 +8,7 @@ parts:
     drums:
       kicks: 2
 plans:
-  plan:
+  album:
     song:
       concatenate:
       - fade:

diff --git a/songs-grinnz/between-the-buried-and-me/the-black-box/song.yml b/songs-grinnz/between-the-buried-and-me/the-black-box/song.yml
@@ -8,7 +8,7 @@ parts:
     drums:
       kicks: 2
 plans:
-  plan:
+  album:
     song:
       concatenate:
       - fade:

diff --git a/songs/trioscapes/blast-off/notes.mid b/songs/trioscapes/blast-off/notes.mid
diff --git a/songs/trioscapes/blast-off/song.yml b/songs/trioscapes/blast-off/song.yml
@@ -50,6 +50,7 @@ parts:
       difficulty: 7
       tones:
         file-tone-base: ../../../tones/ViolationDrive.tone2014.xml
+        # TODO clean tone for middle section, maybe other tones
 targets:
   rb3:
     game: rb3

diff --git a/todo-songs.txt b/todo-songs.txt
@@ -109,7 +109,6 @@ NES JAMS (Shnabubula)
 PRO GUITAR/BASS
 - leyenda (williams) pretty much done
 > sys chaos; see DT
-> foam born (btbam)
 > dark world (insaneintherain)
 > giant steps (coltrane)
 > kung fu world champion (hiromi)
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ parts: @@
       guitar:
         grybo: {}
     plans:
-      plan:
+      album:
         parts: {}
         song:
           concatenate:
@@ Expand Down @@