Skip to content

Commit

Permalink
Added Settings for freepplay, made the character select json more eas…
Browse files Browse the repository at this point in the history 
…ier to understand and fixing a typo
  • Loading branch information
@CamLikesKirby
CamLikesKirby committed May 19, 2024
1 parent 401ed81 commit 37ab098
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin' | VS. Dave and Bambi 3.0b | Modable ?.?.?" file="VsDaveModable" packageName="dnbteam.daveandbambi" package="dnbteam.daveandbambi" main="Main" version="3.0.0" company="dnbteam"/>
<app title="Friday Night Funkin' | VS. Dave and Bambi 3.0b | Moddable ?.?.?" file="VsDaveModdable" packageName="dnbteam.daveandbambi" package="dnbteam.daveandbambi" main="Main" version="3.0.0" company="dnbteam"/>
<app preloader="flixel.system.FlxPreloader"/>

<set name="APP_ID" value="0x0100f6c013bbc000"/>
Expand Down
13 changes: 13 additions & 0 deletions assets/preload/data/FreeplaySettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"skipSelect": [
"five-nights",
"vs-dave-rap",
"vs-dave-rap-two"
],
"noExtraKeys": [
"five-nights",
"vs-dave-rap",
"vs-dave-rap-two",
"overdrive"
]
}
68 changes: 34 additions & 34 deletions assets/preload/data/characterSelect.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,128 +3,128 @@
{
"newCharacter": [
{
"casename": "bf",
"playername": "bf",
"thecharactername": "Boyfriend",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
},
{
"casename": "bf-pixel",
"playername": "bf-pixel",
"thecharactername": "Pixel Boyfriend",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
}
],
"mainName": "bf",
"thehotemsithink": [1, 1, 1, 1]
"mainnotems": [1, 1, 1, 1]
},
{
"newCharacter": [
{
"casename": "dave",
"playername": "dave",
"thecharactername": "Dave",
"thenotemsagain": [0.25, 0.25, 2, 2],
"thenotems": [0.25, 0.25, 2, 2],
"notestyle": ""
}
],
"mainName": "dave",
"thehotemsithink": [0.25, 0.25, 2, 2]
"mainnotems": [0.25, 0.25, 2, 2]
},
{
"newCharacter": [
{
"casename": "bambi-new",
"playername": "bambi-new",
"thecharactername": "Bambi",
"thenotemsagain": [0, 0, 3, 0]
"thenotems": [0, 0, 3, 0]
}
],
"mainName": "bambi",
"thehotemsithink": [0, 0, 3, 0]
"mainnotems": [0, 0, 3, 0]
},
{
"newCharacter": [
{
"casename": "tristan",
"playername": "tristan",
"thecharactername": "Tristan",
"thenotemsagain": [2, 0.5, 0.5, 0.5],
"thenotems": [2, 0.5, 0.5, 0.5],
"notestyle": ""
}
],
"mainName": "tristan",
"thehotemsithink": [2, 0.5, 0.5, 0.5]
"mainnotems": [2, 0.5, 0.5, 0.5]
},
{
"newCharacter": [
{
"casename": "tristan-golden",
"playername": "tristan-golden",
"thecharactername": "Tristan Golden",
"thenotemsagain": [0.25, 0.25, 0.25, 2],
"thenotems": [0.25, 0.25, 0.25, 2],
"notestyle": ""
}
],
"mainName": "tristan-golden",
"thehotemsithink": [0.25, 0.25, 0.25, 2]
"mainnotems": [0.25, 0.25, 0.25, 2]
},
{
"newCharacter": [
{
"casename": "dave-angey",
"playername": "dave-angey",
"thecharactername": "3D Dave",
"thenotemsagain": [2, 2, 0.25, 0.25],
"thenotems": [2, 2, 0.25, 0.25],
"notestyle": "3D"
},
{
"casename": "dave-festival-3d",
"playername": "dave-festival-3d",
"thecharactername": "3D Dave Festival",
"thenotemsagain": [2, 2, 0.25, 0.25],
"thenotems": [2, 2, 0.25, 0.25],
"notestyle": "3D"
}
],
"mainName": "dave-angey",
"thehotemsithink": [2, 2, 0.25, 0.25]
"mainnotems": [2, 2, 0.25, 0.25]
},
{
"newCharacter": [
{
"casename": "bambi-3d",
"playername": "bambi-3d",
"thecharactername": "Expunged",
"thenotemsagain": [0, 3, 0, 0],
"thenotems": [0, 3, 0, 0],
"notestyle": "3D"
}
],
"mainName": "bambi-3d",
"thehotemsithink": [0, 3, 0, 0]
"mainnotems": [0, 3, 0, 0]

},
{
"newCharacter": [
{
"casename": "shaggy",
"playername": "shaggy",
"thecharactername": "Shaggy",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
},
{
"casename": "supershaggy",
"playername": "supershaggy",
"thecharactername": "Shaggy (0.001%)",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
},
{
"casename": "godshaggy",
"playername": "godshaggy",
"thecharactername": "Shaggy (0.002%)",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
},
{
"casename": "redshaggy",
"playername": "redshaggy",
"thecharactername": "Red Shaggy",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
}
],
"mainName": "shaggy",
"thehotemsithink": [1, 1, 1, 1]
"mainnotems": [1, 1, 1, 1]
}
]
}
Binary file added assets/preload/sounds/nothing.ogg
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions mods/test/data/FreeplaySettings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"skipSelect": [],
"noExtraKeys": [
"test"
]
}
6 changes: 3 additions & 3 deletions mods/test/data/characterSelect.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
{
"newCharacter": [
{
"casename": "bf-pixel",
"playername": "bf-pixel",
"thecharactername": "Test",
"thenotemsagain": [1, 1, 1, 1],
"thenotems": [1, 1, 1, 1],
"notestyle": ""
}
],
"mainName": "testtwo",
"thehotemsithink": [1, 1, 1, 1]
"mainnotems": [1, 1, 1, 1]
}
]
}
26 changes: 13 additions & 13 deletions skins/characterSelect.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"characters": [
"characters": [
{
"newCharacter": [
{
"newCharacter": [
{
"casename": "bf-pixel",
"thecharactername": "Test",
"thenotemsagain": [1, 1, 1, 1],
"notestyle": ""
}
],
"mainName": "test",
"thehotemsithink": [1, 1, 1, 1]
"playername": "bf-pixel",
"thecharactername": "Test",
"thenotems": [1, 1, 1, 1],
"notestyle": ""
}
]
}
],
"mainName": "test",
"mainnotems": [1, 1, 1, 1]
}
]
}
21 changes: 11 additions & 10 deletions source/CharacterSelectState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ typedef CharSelectStuff =
{
var newCharacter:Array<TheActualChar>;
var mainName:String;
var thehotemsithink:Array<Float>;
var mainnotems:Array<Float>;

}

typedef TheActualChar =
{
var casename:String;
var playername:String;
var thecharactername:String;
var thenotemsagain:Array<Float>;
var thenotems:Array<Float>;
var notestyle:String;
}
class CharacterInSelect
Expand Down Expand Up @@ -185,35 +185,36 @@ class CharacterSelectState extends MusicBeatState

for (character in json.characters) { // Normal
var mainName:String = character.mainName;
var thehotemsithink:Array<Float> = character.thehotemsithink;
var thehotemsithink:Array<Float> = character.mainnotems;

var newCharacterForms:Array<CharacterForm> = [];
for (newChar in character.newCharacter) {
newCharacterForms.push(new CharacterForm(newChar.casename, newChar.thecharactername, newChar.thenotemsagain, newChar.notestyle));
newCharacterForms.push(new CharacterForm(newChar.playername, newChar.thecharactername, newChar.thenotems, newChar.notestyle));
}

characters.push(new CharacterInSelect(mainName, thehotemsithink, newCharacterForms));
}

if (FileSystem.exists(TitleState.modFolder + 'Skins/characterSelect.json')) {
for (character in jsonCustom.characters) { // For Globle Characters
var mainName:String = character.mainName;
var thehotemsithink:Array<Float> = character.thehotemsithink;
var thehotemsithink:Array<Float> = character.mainnotems;

var newCharacterForms:Array<CharacterForm> = [];
for (newChar in character.newCharacter) {
newCharacterForms.push(new CharacterForm(newChar.casename, newChar.thecharactername, newChar.thenotemsagain, newChar.notestyle));
newCharacterForms.push(new CharacterForm(newChar.playername, newChar.thecharactername, newChar.thenotems, newChar.notestyle));
}

characters.push(new CharacterInSelect(mainName, thehotemsithink, newCharacterForms));
}
}
if (FileSystem.exists(TitleState.modFolder + '/data/characterSelect.json')) {
for (character in jsonCustom2.characters) { // For Characters in Mod Packs
var mainName:String = character.mainName;
var thehotemsithink:Array<Float> = character.thehotemsithink;
var thehotemsithink:Array<Float> = character.mainnotems;

var newCharacterForms:Array<CharacterForm> = [];
for (newChar in character.newCharacter) {
newCharacterForms.push(new CharacterForm(newChar.casename, newChar.thecharactername, newChar.thenotemsagain, newChar.notestyle));
newCharacterForms.push(new CharacterForm(newChar.playername, newChar.thecharactername, newChar.thenotems, newChar.notestyle));
}

characters.push(new CharacterInSelect(mainName, thehotemsithink, newCharacterForms));
Expand Down
Loading

1 comment on commit 37ab098

@CamLikesKirby
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah I spelled freeplay wrong and said I fixed a typo

Please sign in to comment.