Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/poec987/FNF-V3
Browse files Browse the repository at this point in the history
  • Loading branch information
x8c8r committed Jul 14, 2024
2 parents b6a6ee8 + 22315f5 commit a4983fe
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 2 deletions.
8 changes: 8 additions & 0 deletions assets/preload/data/tutorial/cocoaDialogue.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
:bf:yes yes yes! it's my tutorial
:dad:but this time it is three
:bf:the third version!
:bf:now you can teach me to beat your dad v3 chicken nugget style
:dad:i will be ready to teach you
:dad:but be worried i am more powerful than the last time!!
:bf:give it the best you have got!
:bf:i am ready for version 3!!!
2 changes: 1 addition & 1 deletion assets/preload/data/tutorial/tutorial.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"song":{"sectionLengths":[],"player1":"bf","player2":"gf","notes":[{"sectionNotes":[],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[9600,0,0],[10800,0,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[12000,0,0],[13200,0,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[14400,2,0],[15600,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[16800,2,0],[18000,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[20400,1,0],[19200,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[22800,1,0],[21600,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[24000,2,0],[25200,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[26400,2,0],[27600,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[30000,2,0],[28800,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[31200,2,0],[32100,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[33600,1,0],[34800,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[36000,1,0],[37200,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[38400,3,0],[39450,3,0],[40500,3,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[41550,3,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[44400,2,0],[43200,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[45600,2,0],[46800,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[49800,3,0],[48000,0,0],[48450,1,0],[49200,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[52200,3,0],[50400,0,0],[51000,1,0],[51600,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[52800,2,0],[53400,2,0],[54600,2,0],[54000,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[55200,2,0],[57000,2,0],[55800,2,0],[56400,1,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"sectionNotes":[[57600,0,0],[57750,0,0],[58050,1,0],[58200,1,0],[58500,2,0],[58650,2,0],[59100,3,0],[59250,3,0],[59700,0,0],[59850,0,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[60150,1,0],[60300,1,0],[60750,2,0],[60900,2,0],[61350,3,0],[61500,3,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":false},{"sectionNotes":[[62400,2,0],[62550,2,0],[63000,2,0],[63150,2,0],[63600,1,0],[63750,1,0],[64200,2,0],[64350,2,0]],"lengthInSteps":16,"typeOfSection":0,"mustHitSection":true},{"typeOfSection":0,"sectionNotes":[[64800,2,0],[64950,2,0],[65400,2,0],[65550,2,0],[66000,1,0],[66150,1,0],[66600,2,0],[66750,2,0]],"lengthInSteps":16,"bpm":100,"changeBPM":false,"mustHitSection":true},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[[67200,1,450],[67350,2,150],[67500,2,150],[67650,2,150],[67800,2,0],[67950,2,0],[67800,1,0],[67500,0,0],[68250,1,0],[68250,0,150],[68400,0,0],[68550,0,150],[68550,1,0],[68400,3,0],[68700,2,150],[68850,1,0],[69000,1,0],[69150,1,0],[69300,1,0]],"bpm":100,"changeBPM":false,"mustHitSection":false},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[[70200,2,0],[70350,1,0],[70342.5,0,0],[70507.5,0,0],[70623.75,2,0],[70616.25,2,0],[70451.25,3,0],[70361.25,3,0],[70800,0,0],[70980,1,0],[71152.5,2,0],[71032.5,2,0],[71032.5,3,0]],"bpm":100,"changeBPM":false,"mustHitSection":false},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[[73023.75,2,0],[72960,2,0],[72930,2,0],[72881.25,2,0],[72813.75,2,0],[72727.5,2,0],[72633.75,2,0]],"bpm":100,"changeBPM":false,"mustHitSection":true}],"song":"Tutorial","validScore":true,"sections":0,"needsVoices":false,"speed":1,"bpm":100}}
{"song":{"player1":"bf","sectionLengths":[],"notes":[{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[9600,0,0],[10800,0,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12000,0,0],[13200,0,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14400,2,0],[15600,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16800,2,0],[18000,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20400,1,0],[19200,1,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[22800,1,0],[21600,1,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,2,0],[25200,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26400,2,0],[27600,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30000,2,0],[28800,2,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[31200,2,0],[32100,2,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33600,1,0],[34800,1,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36000,1,0],[37200,1,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38400,3,0],[39450,3,0],[40500,3,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[41550,3,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44400,2,0],[43200,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45600,2,0],[46800,2,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[49800,3,0],[48000,0,0],[48450,1,0],[49200,2,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52200,3,0],[50400,0,0],[51000,1,0],[51600,2,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52800,2,0],[53400,2,0],[54600,2,0],[54000,1,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55200,2,0],[57000,2,0],[55800,2,0],[56400,1,0]],"mustHitSection":true},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[57600,0,0],[57750,0,0],[58050,1,0],[58200,1,0],[58500,2,0],[58650,2,0],[59100,3,0],[59250,3,0],[59700,0,0],[59850,0,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60150,1,0],[60300,1,0],[60750,2,0],[60900,2,0],[61350,3,0],[61500,3,0]],"mustHitSection":false},{"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62400,2,0],[62550,2,0],[63000,2,0],[63150,2,0],[63600,1,0],[63750,1,0],[64200,2,0],[64350,2,0]],"mustHitSection":true},{"lengthInSteps":16,"sectionNotes":[[64800,2,0],[64950,2,0],[65400,2,0],[65550,2,0],[66000,1,0],[66150,1,0],[66600,2,0],[66750,2,0]],"typeOfSection":0,"mustHitSection":true,"changeBPM":false,"bpm":100},{"sectionNotes":[[67200,1,450],[67350,2,150],[67500,2,150],[67650,2,150],[67800,2,0],[67950,2,0],[67800,1,0],[67500,0,0],[68250,1,0],[68250,0,150],[68400,0,0],[68550,0,150],[68550,1,0],[68400,3,0],[68700,2,150],[68850,1,0],[69000,1,0],[69150,1,0],[69300,1,0]],"typeOfSection":0,"lengthInSteps":16,"altAnim":false,"mustHitSection":false,"changeBPM":false,"bpm":100},{"sectionNotes":[[70200,2,0],[70350,1,0],[70342.5,0,0],[70507.5,0,0],[70623.75,2,0],[70616.25,2,0],[70451.25,3,0],[70361.25,3,0],[70800,0,0],[70980,1,0],[71152.5,2,0],[71032.5,2,0],[71032.5,3,0]],"typeOfSection":0,"lengthInSteps":16,"altAnim":false,"mustHitSection":false,"changeBPM":false,"bpm":100},{"sectionNotes":[[73023.75,2,0],[72960,2,0],[72930,2,0],[72881.25,2,0],[72813.75,2,0],[72727.5,2,0],[72633.75,2,0]],"typeOfSection":0,"lengthInSteps":16,"altAnim":false,"mustHitSection":true,"changeBPM":false,"bpm":100},{"lengthInSteps":16,"altAnim":false,"typeOfSection":0,"sectionNotes":[],"bpm":100,"changeBPM":false,"mustHitSection":true}],"player2":"gf","hasDialogue":true,"song":"Tutorial","validScore":true,"sections":0,"needsVoices":false,"bpm":100,"speed":1}}
2 changes: 1 addition & 1 deletion assets/shared/images/dialogue/boxes/songDBDefine.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tutorial::week1
tutorial::tutorial
bopeebo::week1
fresh::week1
dadbattle::week1
Expand Down
Binary file added assets/shared/images/dialogue/boxes/tutorial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/shared/images/dialogue/boxes/tutorial.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Text Box Appear
Text Box Appear
10 changes: 10 additions & 0 deletions assets/shared/images/dialogue/boxes/tutorial.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="week2.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Text Box Appear instance 10000" x="0" y="0" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10001" x="259" y="0" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10002" x="0" y="154" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10003" x="259" y="154" width="249" height="144"/>
<SubTexture name="Text Box Appear instance 10004" x="259" y="154" width="249" height="144"/>
</TextureAtlas>
Binary file added assets/shared/images/dialogue/characters/gf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/shared/images/dialogue/characters/gf.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Boyfriend portrait enter
0
40
-20
40
false
14 changes: 14 additions & 0 deletions assets/shared/images/dialogue/characters/gf.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="bfPortrait.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Boyfriend portrait enter instance 10000" x="0" y="0" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10001" x="259" y="0" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10002" x="259" y="0" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10003" x="0" y="155" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10004" x="0" y="155" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10005" x="259" y="155" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10006" x="259" y="155" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10007" x="259" y="155" width="249" height="145"/>
<SubTexture name="Boyfriend portrait enter instance 10008" x="259" y="155" width="249" height="145"/>
</TextureAtlas>

0 comments on commit a4983fe

Please sign in to comment.