Unify Police and Sound Of Da Police

beatboxjs · Aug 2, 2024 · ce2bc86 · ce2bc86
1 parent c783543
commit ce2bc86
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 95 deletions.
diff --git a/assets/tuneDescriptions/police.md b/assets/tuneDescriptions/police.md
@@ -1,6 +1,4 @@
-**Sign:** screwing and unscrewing a light bulb with your right hand
-
-Note that there are two tunes based on the same song (Police and Sound of Da Police).
+**Sign:** hold one hand inside up and turn it left and right like the blue ligths of a police car
 
 ## Background
 
@@ -14,3 +12,10 @@ Note that there are two tunes based on the same song (Police and Sound of Da Pol
 * **Snare**: easy
 * **Tamb**: medium
 * **Agogô**: easy
+
+## Breaks
+
+* **Beast Break** handsignal: evil claws going down (hand inside down, moving from up to down)
+* **Beast Break inverted** handsignal: evil claws going up (hand inside up, moving from down to up)
+
+* **Shouting** Oo is pronounced as Whoop!
diff --git a/assets/tuneDescriptions/sound-of-da-police.md b/assets/tuneDescriptions/sound-of-da-police.md
diff --git a/src/defaultTunes.ts b/src/defaultTunes.ts
@@ -1952,50 +1952,69 @@ const rawTunes: {[tuneName: string]: RawTune} = {
 		exampleSong: ['Tune', 'Tune', 'Tune', 'Tune', 'Break 1', 'Tune', 'Tune', 'Tune', 'Tune', 'Break 2', 'Tune', 'Tune', 'Tune', 'Tune', 'Break 3', 'Tune', 'Tune', 'Tune', 'Tune', 'Clave Plus', 'Tune', 'Tune', 'Tune', 'Tune', 'Disco Barricade Break', 'Tune', 'Tune', 'Tune', 'Tune', 'Bra Break', 'Tune', 'Tune', 'Tune', 'Tune']
 	},
 	'Police': {
-		displayName: "Police",
+		displayName: "Sound of da Police",
 		categories: [ "new", "uncommon", "medium" ],
 		sheet: sheetUrl + "sound-of-da-police.pdf",
 		descriptionHtml: tuneDescriptionsHtml.police,
 		patterns: {
 			Intro: {
-				ls: "      XXXXXXX         XXX XXX",
+				ls: "      XXXXXXX         XXX XXX   ",
 				ms: "@ls",
 				hs: "@ls",
-				ot: "D  D            D  D",
+				ot: "D  D            D  D            ",
 			},
 			Tune: {
 				loop: true,
-				ls: "X  X    X   X   X  X    X   X",
-				ms: "      XXXXXXX         XXX XXX",
+				ls: "X  X    s   s   X  X    s   s   ",
+				ms: "      XXXXXXX         XXX XXX   ",
 				hs: "@ms",
 				re: "f hf hXhf h Xhrhf hf hXhf h Xhrh",
 				sn: "X..X........X...X..X........X...",
-				ta: "  XX  XX  XX  XX  XX  XX  XX  XX",
-				ag: "a  a  a o a o   a  a  a o a o",
-				ot: "D  D            D  D",
-
+				ta: "  XX  XX      XX  XX  XX      XX",
+				ag: "a  a  a o a o   a  a  a o a o   ",
+				ot: "D  D            D  D            ",
 			},
 			"Break 1": {
-				ls: "      XXXXXXX         XXX XXX",
+				ls: "X X X X X X X X ",
 				ms: "@ls",
 				hs: "@ls",
 				re: "@ls",
 				sn: "@ls",
 				ta: "@ls",
-				ag: "a  a            a  a         ",
-				ot: "D  D            D  D",
+				ag: "o o o o o o o o ",
 			},
-			"Break 1 Inverted": {
-				ls: "X  X            X  X",
+			"Break 2": {
+				ls: "X  X            X  X            ",
 				ms: "@ls",
 				hs: "@ls",
 				re: "@ls",
 				sn: "@ls",
 				ta: "@ls",
-				ag: "      aaaaaaa         aaa aaa",
-			}
+				ag: "a  a            a  a            ",
+				ot: "D  D            D  D            ",
+			},
+			"Beast Break": {
+				ls: "X  X            X  X            ",
+				ms: "@ls",
+				hs: "@ls",
+				re: "      XXXXXXX         XXX XXX   ",
+				sn: "@ls",
+				ta: "@ls",
+				ag: "      aaaaaaa         aaa aaa   ",
+				ot: "D  D            D  D            ",
+			},
+			"Beast Break Inverted": {
+				ls: "      XXXXXXX         XXX XXX   ",
+				ms: "@ls",
+				hs: "@ls",
+				re: "@ls",
+				sn: "@ls",
+				ta: "@ls",
+				ag: "a  a            a  a            ",
+				ot: "D  D            D  D            ",
+			},
 		},
-		exampleSong: ["Intro", "Tune", "Tune", "Tune", "Tune", "Break 1", "Break 1 Inverted"]
+		exampleSong: ["Intro", "Tune", "Tune", "Break 1", "Tune", "Tune", "Break 2", "Tune", "Tune", "Beast Break", "Tune", "Tune", "Beast Break Inverted"]
 	},
 	'Ragga': {
 		categories: [ "common", "tricky" ],
@@ -2560,65 +2579,6 @@ const rawTunes: {[tuneName: string]: RawTune} = {
 		},
 		exampleSong: [ "Intro", "Tune", "Break 1", "Tune", "Break 2", "Tune", "Break 3", "Tune", "Whistle Break", "Tune", "Outro" ]
 	},
-	'Sound of da Police': {
-		categories: [ "new", "uncommon", "medium" ],
-		sheet: sheetUrl + "sound-of-da-police.pdf",
-		descriptionHtml: tuneDescriptionsHtml.soundOfDaPolice,
-		patterns: {
-			Tune: {
-				loop: true,
-				ls: "X  X    X   X   X  X    X   X   ",
-				ms: "      XXXXXXX         XXX XXX   ",
-				hs: "@ms",
-				re: "f hf hXhf h Xhrhf hf hXhf h Xhrh",
-				sn: "X..X........X...X..X........X...",
-				ta: "  XX  XX  XX  XX  XX  XX  XX  XX",
-				ag: "a  a  a o a o   a  a  a o a o   ",
-				ot: "D  D            D  D            ",
-			},
-			"Break 1": {
-				ls: "X X X X X X X X ",
-				ms: "@ls",
-				hs: "@ls",
-				re: "@ls",
-				sn: "@ls",
-				ta: "@ls",
-				ag: "o o o o o o o o ",
-				sh: "@ls"
-			},
-			"Break 2": {
-				ls: "X  X            X  X            ",
-				ms: "@ls",
-				hs: "@ls",
-				re: "@ls",
-				sn: "@ls",
-				ta: "@ls",
-				ag: "a  a            a  a            ",
-				ot: "D  D            D  D            ",
-			},
-			"Beast Break": {
-				ls: "X  X            X  X            ",
-				ms: "@ls",
-				hs: "@ls",
-				re: "      XXXXXXX         XXX XXX   ",
-				sn: "@ls",
-				ta: "@ls",
-				ag: "      aaaaaaa         aaa aaa   ",
-				ot: "D  D            D  D            ",
-			},
-			"Beast Break Inverted": {
-				ls: "      XXXXXXX         XXX XXX   ",
-				ms: "@ls",
-				hs: "@ls",
-				re: "@ls",
-				sn: "@ls",
-				ta: "@ls",
-				ag: "a  a            a  a            ",
-				ot: "D  D            D  D            ",
-			},
-		},
-		exampleSong: ["Tune", "Tune", "Break 1", "Tune", "Tune", "Break 2", "Tune", "Tune", "Beast Break", "Tune", "Tune", "Beast Break Inverted",]
-	},
 	'Tequila': {
 		categories: [ "uncommon", "medium", "western" ],
 		sheet: sheetUrl + "tequila.pdf",