Skip to content

Commit

Permalink
Charting state fixes and new features
Browse files Browse the repository at this point in the history
  • Loading branch information
@AFunkinDisappointment
AFunkinDisappointment committed Mar 5, 2022
1 parent 12520f8 commit 049466c
Show file tree
Hide file tree
Showing 15 changed files with 583 additions and 531 deletions.
Binary file modified .vs/slnx.sqlite
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->
<!-- i think that company and file is where the save data is stored -->
<app title="Friday Night Disappointin' Modding Plus" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="1.2.0" company="ninjamuffin99" />
<app title="Friday Night Disappointin' Modding Plus" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="1.2.2" company="ninjamuffin99" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down Expand Up @@ -53,6 +53,7 @@
<assets path="assets/music"/>
<assets path="assets/songs"/>
<assets path="assets/sounds"/>
<assets path="assets/module"/>
<assets path="assets/discord"/>
<assets path='TempFiles' rename='Templates' embed='false'/>

Expand Down
Binary file modified assets/images/custom_chars/bf-car/icons.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/custom_chars/bf-christmas/icons.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 24 additions & 15 deletions assets/images/custom_chars/bf.hscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,41 @@ function init(char) {

char.animation.addByPrefix('hey', "BF HEY", 24, false);
char.animation.addByPrefix('scared', 'BF idle shaking', 24);
char.animation.addByPrefix('dodge', "boyfriend dodge", 24, false);

char.animation.addByPrefix('firstDeath', 'BF dies', 24, false);
char.animation.addByPrefix('deathLoop', 'BF Dead Loop', 24, true);
char.animation.addByPrefix('deathConfirm', 'BF Dead confirm', 24, false);

char.addOffset('idle', -5);
char.addOffset('idle');
if (char.isPlayer) {
char.addOffset('singUP', -29, 27);
char.addOffset('singRIGHT', -38, -7);
char.addOffset('singLEFT', 12, -6);
char.addOffset('singUP', -38, 28);
char.addOffset('singRIGHT', -46, -5);
char.addOffset('singLEFT', 11, -6);
char.addOffset('singDOWN', -10, -50);
char.addOffset('singUPmiss', -37, 24);
char.addOffset('singRIGHTmiss', -42, 20);
char.addOffset('singLEFTmiss', 6, 20);
char.addOffset('singDOWNmiss', -11, -19);
char.addOffset('hey', 1, 5);
char.addOffset('scared', -1, 1);
char.addOffset('dodge', -6, -13);
} else {
char.addOffset('singUP', 1, 27);
char.addOffset('singRIGHT', -35, -7);
char.addOffset('singLEFT', 36, -6);
char.addOffset('singUP', 7, 31);
char.addOffset('singRIGHT', -36, -7);
char.addOffset('singLEFT', 44, -5);
char.addOffset('singDOWN', -20, -50);
char.addOffset('singUPmiss', 11, 24);
char.addOffset('singRIGHTmiss', -33, 22);
char.addOffset('singLEFTmiss', 50, 20);
char.addOffset('singDOWNmiss', -12, -20);
char.addOffset('hey', 3, 5);
char.addOffset('scared', 0, 1);
char.addOffset('dodge', -34, -15);
}
char.addOffset('singUPmiss', -29, 27);
char.addOffset('singRIGHTmiss', -30, 21);
char.addOffset('singLEFTmiss', 12, 24);
char.addOffset('singDOWNmiss', -11, -19);
char.addOffset('hey', 7, 4);
char.addOffset('firstDeath', 37, 11);
char.addOffset('deathLoop', 37, 5);
char.addOffset('deathConfirm', 37, 69);
char.addOffset('scared', -4);

char.playAnim('idle');

Expand All @@ -59,11 +68,11 @@ function init(char) {
char.playerOffsetX = 0;
char.playerOffsetY = 0;
if (char.isPlayer) {
char.followCamX = 0; //50
char.followCamX = 0;
char.followCamY = 0;
} else {
char.followCamX = 250;
char.followCamY = -200;
char.followCamY = 0;
}
char.midpointX = 0;
char.midpointY = 0;
Expand Down
Binary file modified assets/images/custom_chars/bf/icons.png
View file
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/images/custom_chars/monster-christmas.hscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ function init(char) {
char.addOffset('singLEFT', -30);
char.addOffset('singDOWN', -30, -94);
}
char.addCamOffset('singRIGHT', -25);
char.addCamOffset('singLEFT', 25);

char.playAnim('idle');

Expand Down
2 changes: 2 additions & 0 deletions assets/images/custom_chars/monster.hscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ function init(char) {
char.addOffset('singLEFT', -30);
char.addOffset('singDOWN', -30, -94);
}
char.addCamOffset('singRIGHT', -25);
char.addCamOffset('singLEFT', 25);

char.playAnim('idle');

Expand Down
8 changes: 5 additions & 3 deletions assets/images/custom_chars/newmonster.hscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@ function init(char) {

char.addOffset('idle');
if (char.isPlayer) {
char.addOffset('singUP', -50, 91);
char.addOffset('singUP', -50, 91);
char.addOffset('singRIGHT', 20);
char.addOffset('singLEFT', -61, 20);
char.addOffset('singDOWN', 2, -94);
} else {
char.addOffset('singUP', -20, 84);
char.addOffset('singUP', -20, 84);
char.addOffset('singLEFT', -30);
char.addOffset('singRIGHT', -51, 0);
char.addOffset('singDOWN', -38, -94);
char.addOffset('singDOWN', -38, -94);
}
char.addCamOffset('singRIGHT', -25);
char.addCamOffset('singLEFT', 25);

char.playAnim('idle');

Expand Down
8 changes: 6 additions & 2 deletions source/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ typedef TCharacterRefJson = {
class Character extends FlxSprite
{
public var animOffsets:Map<String, Array<Dynamic>>;
public var camOffsets:Map<String, Array<Dynamic>>;
public var debugMode:Bool = false;

public var isPlayer:Bool = false;
Expand Down Expand Up @@ -145,6 +146,7 @@ class Character extends FlxSprite
public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
{
animOffsets = new Map<String, Array<Dynamic>>();
camOffsets = new Map<String, Array<Dynamic>>();
super(x, y);

curCharacter = character;
Expand Down Expand Up @@ -415,10 +417,12 @@ class Character extends FlxSprite
var bThing = b[0];
return aThing < bThing ? -1 : 1;
}
public function addOffset(name:String, x:Float = 0, y:Float = 0)
{
public function addOffset(name:String, x:Float = 0, y:Float = 0) {
animOffsets[name] = [x, y];
}
public function addCamOffset(name:String, camX:Float = 0, camY:Float = 0) {
camOffsets[name] = [camX, camY];
}
public static function getAnimInterp(char:String):Interp {
var interp = PluginManager.createSimpleInterp();
var parser = new hscript.Parser();
Expand Down
Loading

0 comments on commit 049466c

Please sign in to comment.