Skip to content

Commit 0e060fa

Browse files
committed
The Great Organization
pretzel
1 parent 60e1909 commit 0e060fa

File tree

57 files changed

+943
-1027
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+943
-1027
lines changed
Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
{
22
"version": "2.2.4",
3-
"timeFormat": "ms",
3+
"songName": "2hot",
44
"artist": "Kawai Sprite",
55
"charter": "Jenny Crowe + Spazkid + ninjamuffin99",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": -1, "bpm": 182, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
7-
"stage": "phillyStreets",
8-
"characters": {
9-
"player": "pico-playable",
10-
"girlfriend": "nene",
11-
"opponent": "darnell"
12-
},
13-
"ratings": { "easy": 3, "normal": 4, "hard": 5 },
12+
"songVariations": [],
1413
"difficulties": ["easy", "normal", "hard"],
15-
"noteStyle": "funkin",
16-
"album": "volume3",
17-
"stickerPack": "bonus-weekend1",
18-
"previewStart": 0,
19-
"previewEnd": 15000
14+
"characters": {"player": "pico-playable","girlfriend": "nene","opponent": "darnell"},
15+
"stage": "phillyStreets",
16+
"noteStyle": "funkin"
2017
},
21-
"songName": "2hot",
22-
"timeChanges": [{ "d": 4, "n": 4, "t": -1, "bt": [4, 4, 4, 4], "bpm": 182 }],
18+
"instrumental": "",
19+
"altInstrumentals": [],
20+
"ratings": { "easy": 3, "normal": 4, "hard": 5},
21+
"album": "volume3",
22+
"stickerPack": "bonus-weekend1",
23+
"previewStart": 0,
24+
"previewEnd": 15000,
2325
"generatedBy": "Chart Editor Import (FNF Legacy)"
24-
}
26+
}

preload/data/songs/blammed/blammed-metadata-erect.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"songName": "Blammed Erect",
44
"artist": "Kawai Sprite",
55
"charter": "fabs + Spazkid",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 170, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["erect", "nightmare"],
8-
"characters": {
9-
"player": "bf",
10-
"girlfriend": "gf",
11-
"opponent": "pico",
12-
"instrumental": "erect"
13-
},
14+
"characters": {"player": "bf","girlfriend": "gf","opponent": "pico"},
1415
"stage": "phillyTrainErect",
15-
"noteStyle": "funkin",
16-
"ratings": { "erect": 11, "nightmare": 12 },
17-
"album": "volume3",
18-
"previewStart": 0,
19-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2017
},
21-
"generatedBy": "Friday Night Funkin' - v0.3.0 (rewrite/master:a2b20fb) PROTOTYPE",
22-
"timeFormat": "ms",
23-
"timeChanges": [
24-
{ "t": 0, "b": 0, "bpm": 170, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
25-
]
26-
}
18+
"instrumental": "erect",
19+
"altInstrumentals": [],
20+
"ratings": { "erect": 11, "nightmare": 12 },
21+
"album": "volume3",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Friday Night Funkin' - v0.3.0 (rewrite/master:a2b20fb) PROTOTYPE"
26+
}

preload/data/songs/blammed/blammed-metadata-pico.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
"songName": "Blammed (Pico Mix)",
44
"artist": "Metaroom (feat. Saruky)",
55
"charter": "fabs + Spazkid",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 165, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["easy", "normal", "hard"],
8-
"characters": {
9-
"player": "pico-playable",
10-
"girlfriend": "nene",
11-
"opponent": "pico",
12-
"instrumental": "pico",
13-
"altInstrumentals": []
14-
},
14+
"characters": {"player": "pico-playable","girlfriend": "nene","opponent": "pico"},
1515
"stage": "phillyTrainErect",
16-
"noteStyle": "funkin",
17-
"ratings": { "easy": 3, "normal": 4, "hard": 5 },
18-
"album": "volume4",
19-
"previewStart": 0,
20-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2117
},
22-
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE",
23-
"timeFormat": "ms",
24-
"timeChanges": [
25-
{ "t": 0, "b": 0, "bpm": 165, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
26-
]
27-
}
18+
"instrumental": "pico",
19+
"altInstrumentals": [],
20+
"ratings": { "easy": 3, "normal": 4, "hard": 5},
21+
"album": "volume4",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE"
26+
}
Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
22
"version": "2.2.4",
3-
"timeFormat": "ms",
3+
"songName": "Blammed",
44
"artist": "Kawai Sprite",
55
"charter": "ninjamuffin99 + MtH",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": -1, "bpm": 165, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
7-
"stage": "phillyTrain",
8-
"characters": {
9-
"player": "bf",
10-
"girlfriend": "gf",
11-
"opponent": "pico",
12-
"altInstrumentals": ["pico"]
13-
},
1412
"songVariations": ["erect", "pico"],
1513
"difficulties": ["easy", "normal", "hard"],
16-
"ratings": { "easy": 1, "normal": 2, "hard": 3 },
17-
"noteStyle": "funkin",
18-
"album": "volume1",
19-
"previewStart": 0,
20-
"previewEnd": 15000
14+
"characters": {"player": "bf","girlfriend": "gf","opponent": "pico"},
15+
"stage": "phillyTrain",
16+
"noteStyle": "funkin"
2117
},
22-
"songName": "Blammed",
23-
"timeChanges": [{ "d": 4, "n": 4, "t": -1, "bt": [4, 4, 4, 4], "bpm": 165 }],
18+
"instrumental": "",
19+
"altInstrumentals": ["pico"],
20+
"ratings": { "easy": 1, "normal": 2, "hard": 3},
21+
"album": "volume1",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
2425
"generatedBy": "Chart Editor Import (FNF Legacy)"
25-
}
26+
}

preload/data/songs/blazin/blazin-metadata.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"songName": "Blazin'",
44
"artist": "Kawai Sprite",
55
"charter": "fabs + PhantomArcade",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 180, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["easy", "normal", "hard"],
8-
"characters": {
9-
"player": "pico-blazin",
10-
"girlfriend": "nene",
11-
"opponent": "darnell-blazin"
12-
},
14+
"characters": {"player": "pico-blazin","girlfriend": "nene","opponent": "darnell-blazin"},
1315
"stage": "phillyBlazin",
14-
"noteStyle": "funkin",
15-
"ratings": { "easy": 3, "normal": 4, "hard": 5 },
16-
"album": "volume3",
17-
"stickerPack": "bonus-weekend1",
18-
"previewStart": 0,
19-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2017
},
21-
"generatedBy": "Chart Editor Import (FNF Legacy)",
22-
"timeFormat": "ms",
23-
"timeChanges": [
24-
{ "t": 0, "b": 0, "bpm": 180, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
25-
]
26-
}
18+
"instrumental": "",
19+
"altInstrumentals": [],
20+
"ratings": { "easy": 3, "normal": 4, "hard": 5},
21+
"album": "volume3",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Chart Editor Import (FNF Legacy)"
26+
}

preload/data/songs/bopeebo/bopeebo-metadata-erect.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"songName": "Bopeebo Erect",
44
"artist": "Kawai Sprite (feat. Saruky)",
55
"charter": "Jenny Crowe + fabs + Spazkid",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 123, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["erect", "nightmare"],
8-
"characters": {
9-
"player": "bf",
10-
"girlfriend": "gf",
11-
"opponent": "dad",
12-
"instrumental": "erect"
13-
},
14-
"stage": "mainStageErect",
15-
"noteStyle": "funkin",
16-
"ratings": { "erect": 7, "nightmare": 8 },
17-
"album": "volume3",
18-
"previewStart": 0,
19-
"previewEnd": 15000
14+
"characters": {"player": "bf","girlfriend": "gf","opponent": "dad"},
15+
"stage": "mainStage",
16+
"noteStyle": "funkin"
2017
},
21-
"generatedBy": "Friday Night Funkin' - v0.3.0 PROTOTYPE",
22-
"timeFormat": "ms",
23-
"timeChanges": [
24-
{ "t": 0, "b": 0, "bpm": 123, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
25-
]
26-
}
18+
"instrumental": "erect",
19+
"altInstrumentals": [],
20+
"ratings": { "erect": 7, "nightmare": 8 },
21+
"album": "volume3",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Friday Night Funkin' - v0.3.0 PROTOTYPE"
26+
}

preload/data/songs/bopeebo/bopeebo-metadata-pico.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
"songName": "Bopeebo (Pico Mix)",
44
"artist": "ThatAndyGuy (feat. Saruky)",
55
"charter": "fabs + Spazkid",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 100, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["easy", "normal", "hard"],
8-
"characters": {
9-
"player": "pico-playable",
10-
"girlfriend": "nene",
11-
"opponent": "dad",
12-
"instrumental": "pico",
13-
"altInstrumentals": []
14-
},
14+
"characters": {"player": "pico-playable","girlfriend": "nene","opponent": "dad"},
1515
"stage": "mainStageErect",
16-
"noteStyle": "funkin",
17-
"ratings": { "easy": 1, "normal": 2, "hard": 3 },
18-
"album": "volume4",
19-
"previewStart": 0,
20-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2117
},
22-
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE",
23-
"timeFormat": "ms",
24-
"timeChanges": [
25-
{ "t": 0, "b": 0, "bpm": 100, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
26-
]
27-
}
18+
"instrumental": "pico",
19+
"altInstrumentals": [],
20+
"ratings": { "easy": 1, "normal": 2, "hard": 3},
21+
"album": "volume4",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE"
26+
}

preload/data/songs/bopeebo/bopeebo-metadata.json

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@
44
"artist": "Kawai Sprite",
55
"charter": "ninjamuffin99 + MtH",
66
"timeFormat": "ms",
7-
"offsets": {
8-
"instrumental": 0
9-
},
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
109
"timeChanges": [{ "t": 0, "bpm": 100, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
1111
"playData": {
1212
"songVariations": ["erect", "pico"],
1313
"difficulties": ["easy", "normal", "hard"],
14-
"ratings": { "easy": 1, "normal": 1, "hard": 2 },
15-
"characters": {
16-
"player": "bf",
17-
"girlfriend": "gf",
18-
"opponent": "dad",
19-
"instrumental": "",
20-
"altInstrumentals": ["pico"]
21-
},
14+
"characters": {"player": "bf","girlfriend": "gf","opponent": "dad"},
2215
"stage": "mainStage",
23-
"noteStyle": "funkin",
24-
"album": "volume1",
25-
"previewStart": 0,
26-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2717
},
18+
"instrumental": "",
19+
"altInstrumentals": ["pico"],
20+
"ratings": { "easy": 1, "normal": 1, "hard": 2},
21+
"album": "volume1",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
2825
"generatedBy": "EliteMasterEric (by hand)"
29-
}
26+
}

preload/data/songs/cocoa/cocoa-metadata-erect.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@
33
"songName": "Cocoa Erect",
44
"artist": "Saster",
55
"charter": "fabs + Spazkid",
6+
"timeFormat": "ms",
7+
"divisions": 96,
8+
"offsets": {"instrumental": 0},
9+
"timeChanges": [{ "t": 0, "bpm": 174, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
10+
"looped": false,
611
"playData": {
12+
"songVariations": [],
713
"difficulties": ["erect", "nightmare"],
8-
"characters": {
9-
"player": "bf-christmas",
10-
"girlfriend": "gf-christmas",
11-
"opponent": "parents-christmas",
12-
"instrumental": "erect",
13-
"altInstrumentals": []
14-
},
14+
"characters": {"player": "bf-christmas","girlfriend": "gf-christmas","opponent": "parents-christmas"},
1515
"stage": "mallXmasErect",
16-
"noteStyle": "funkin",
17-
"ratings": { "erect": 7, "nightmare": 8 },
18-
"album": "volume4",
19-
"previewStart": 0,
20-
"previewEnd": 15000
16+
"noteStyle": "funkin"
2117
},
22-
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE",
23-
"timeFormat": "ms",
24-
"timeChanges": [
25-
{ "t": 0, "b": 0, "bpm": 174, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }
26-
]
27-
}
18+
"instrumental": "erect",
19+
"altInstrumentals": [],
20+
"ratings": { "erect": 7, "nightmare": 8 },
21+
"album": "volume4",
22+
"stickerPack": null,
23+
"previewStart": 0,
24+
"previewEnd": 15000,
25+
"generatedBy": "Friday Night Funkin' - v0.5.0 (develop:96c151c:MODIFIED) PROTOTYPE"
26+
}

0 commit comments

Comments
 (0)