Skip to content

Commit

Permalink
2022-8-5
Browse files Browse the repository at this point in the history
  • Loading branch information
PortilizenHub committed Aug 5, 2022
1 parent e21ebad commit 529ee0b
Show file tree
Hide file tree
Showing 22 changed files with 267 additions and 152 deletions.
31 changes: 25 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Colored Health Bar
- MP4 Cutscene Support
- Options Menu
- Full Options Menu
- Fixed Monster Song
- Week 7
- Mod Support
- Full Mod Support
- Arrow Color Changing
- Not Hard-coded Events
- Combo Hud
Expand All @@ -23,10 +23,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Change Main Menu entirely
- Change Main Menu Asset Fuctionality


## [2022-8-5]
### Added
- Basic Options Menu with a Mods Menu (read MODDING.md)
- 2 Default Mods
- Paths.hx function to find folders
- check to see if health icon is null in health icon (if so the animation is set to null)
- Watermark in gameplay
### Changed
- How Tutorial is loaded
- Version system
- if the song characters in freeplay are null then it is the face icon instead of bf
- Main Menu BG scroll Factor
- Chart Editor Default Song
- animation debug gridBG to 16x16 instead of 10x10
- note input thing a bit
### Removed
- Removed check if weeks are unlocked for weeks to be added
### Fixed
- Ninjamuffin_99's code
- Changelog for v2022-8-4 (version 1) AGAIN (im dumb)

## [0.2.0] - 2022-08-04
## [2022-8-4]
### Added
- Helpful Functions file shit
- dialogue Background (doesnt do shit yet)
Expand All @@ -43,9 +61,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Animation Debug Grid BG scroll factor

### Fixed
- Changelog for V0.1.0
- Changelog for v2022-8-4 (version 1)

## [0.1.0] - 2022-08-04
## [2022-8-4]
### Added
- Miss Counter
- Exit to Chart Editor
- Exit to Freeplay and Exit to Story Mode
39 changes: 39 additions & 0 deletions MODDING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# QUICK MOD GUIDE

With the v2022-8-5 update, I added a bit of a slightly nicer mod support backend.

It's a system that requires some haxe experience.

The basis of it is that you go to ModSubState.hx and add your mod stuff.
also with this system you can have multiple mods in one so yeah your welcome
:]

it should look atleast something with these modifications

line 6 to 7 in ModSubState.hx

``` haxe
var modList:Array<String> = ['myMod'];
var modListVAL:Array<Bool> = [myModVAR];
```

now the rest is up to you, but lets go on with it

line 8 (or where ever you decide to put this var OUTSIDE THE FUNCTIONS)
``` haxe
public var myModVAR:Bool = false;
```

line 61 (or above, prob above 61 since you added new line(s))
``` haxe
case "myMod":
if (myModVAR == false)
myModVAR = true;
else if (myModVAR == true)
myModVAR = false;
modListVAL.remove(myModVAR);
modListVAL.push(myModVAR);
trace('myMod: ' + myModVAR);
```

now comes to the part of adding your mod, depending on the mod you will need to modify different files, or a file. I cannot document this process since i dont know what kind of mod you want to make, but as long as you know haxe, you can do it, I beleive in you.
3 changes: 1 addition & 2 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin' Cac-per Engine" file="CacPer" main="Main" version="0.2.0" company="portilizen" />
<app title="Friday Night Funkin' Cac-per Engine" file="CacPer" main="Main" version="2022-8-5" company="portilizen" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down Expand Up @@ -90,7 +90,6 @@
<assets path="assets/week6" library="week6" exclude="*.ogg" if="web"/>
<assets path="assets/week6" library="week6" exclude="*.mp3" unless="web"/>

<assets path='example_mods' rename='mods' embed='false'/>
<assets path='art/readme.txt' rename='do NOT readme.txt' />
<!-- <template path='mods' /> -->

Expand Down
1 change: 0 additions & 1 deletion assets/preload/data/freeplaySonglist.txt

This file was deleted.

1 change: 0 additions & 1 deletion example_mods/introMod/_append/data/introText.txt

This file was deleted.

1 change: 0 additions & 1 deletion example_mods/modList.txt

This file was deleted.

2 changes: 0 additions & 2 deletions example_mods/readme.txt

This file was deleted.

1 change: 1 addition & 0 deletions iconMod/iconMod.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
icon mod is a mod that changes the icons alpha to be 0, aka blank in gameplay.
3 changes: 3 additions & 0 deletions introMod/data/introTextMOD.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
swagshit--moneymoney
i--did it
mod stuff--wooooooooooooooooooooooooooooooooooooooooooooooooooooo
1 change: 1 addition & 0 deletions introMod/introMod.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
intro mod is a mod that modifies the intro text of the game
6 changes: 5 additions & 1 deletion source/AnimationDebug.hx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class AnimationDebug extends FlxState
var isDad:Bool = true;
var daAnim:String = 'spooky';
var camFollow:FlxObject;
var gridBG:FlxSprite;

public function new(daAnim:String = 'spooky')
{
Expand All @@ -35,7 +36,7 @@ class AnimationDebug extends FlxState
{
FlxG.sound.music.stop();

var gridBG:FlxSprite = FlxGridOverlay.create(10, 10);
gridBG = FlxGridOverlay.create(16, 16);
add(gridBG);

if (daAnim == 'bf')
Expand Down Expand Up @@ -111,6 +112,9 @@ class AnimationDebug extends FlxState

override function update(elapsed:Float)
{
gridBG.x = 0;
gridBG.y = 0;

textAnim.text = char.animation.curAnim.name;

if (FlxG.keys.justPressed.E)
Expand Down
4 changes: 2 additions & 2 deletions source/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ class ChartingState extends MusicBeatState
else
{
_song = {
song: 'Test',
song: 'Tutorial',
notes: [],
bpm: 150,
needsVoices: true,
needsVoices: false,
player1: 'bf',
player2: 'dad',
speed: 1,
Expand Down
44 changes: 16 additions & 28 deletions source/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,22 @@ class FreeplayState extends MusicBeatState
var selector:FlxText;
var warning:FlxText;


private var iconArray:Array<HealthIcon> = [];
private var grpSongs:FlxTypedGroup<Alphabet>;
private var curPlaying:Bool = false;

override function create()
{

// FlxG.sound.destroy();
// FlxG.sound.playMusic((Paths.music('freakyMenu')), 1, true);

warning = new FlxText(0, 0, 0, 'This song is not done, come back later when it is', 32);
add(warning);
warning.kill();

HelpfulVariables.songLoadedFromFreeplay = false;
var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));

for (i in 0...initSonglist.length)
{
songs.push(new SongMetadata(initSonglist[i], 1, 'gf'));
}

/*
if (FlxG.sound.music != null)
Expand All @@ -65,27 +64,17 @@ class FreeplayState extends MusicBeatState
#if debug
isDebug = true;
#end

if (StoryMenuState.weekUnlocked[2] || isDebug)
addWeek(['Bopeebo', 'Fresh', 'Dadbattle'], 1, ['dad']);

if (StoryMenuState.weekUnlocked[2] || isDebug)
addWeek(['Spookeez', 'South'], 2, ['spooky']);

if (StoryMenuState.weekUnlocked[3] || isDebug)
addWeek(['Pico', 'Philly', 'Blammed'], 3, ['pico']);

if (StoryMenuState.weekUnlocked[4] || isDebug)
addWeek(['Satin-Panties', 'High', 'Milf'], 4, ['mom']);

if (StoryMenuState.weekUnlocked[5] || isDebug)
addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5, ['parents-christmas', 'parents-christmas', 'monster-christmas']);

if (StoryMenuState.weekUnlocked[6] || isDebug)
addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']);

addSong('Tutorial', 1, 'gf');
addWeek(['Bopeebo', 'Fresh', 'Dadbattle'], 1, ['dad']);
addWeek(['Spookeez', 'South'], 2, ['spooky']);
addWeek(['Pico', 'Philly', 'Blammed'], 3, ['pico']);
addWeek(['Satin-Panties', 'High', 'Milf'], 4, ['mom']);
addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5, ['parents-christmas', 'parents-christmas', 'monster-christmas']);
addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']);

#if debug
addSong('test', 1, 'bf');
addSong('test', 1, 'face');
#end

// LOAD MUSIC
Expand Down Expand Up @@ -173,7 +162,7 @@ class FreeplayState extends MusicBeatState
public function addWeek(songs:Array<String>, weekNum:Int, ?songCharacters:Array<String>)
{
if (songCharacters == null)
songCharacters = ['bf'];
songCharacters = ['face'];

var num:Int = 0;
for (song in songs)
Expand Down Expand Up @@ -278,10 +267,9 @@ class FreeplayState extends MusicBeatState
function changeSelection(change:Int = 0)
{
#if !switch
NGio.logEvent('Fresh');
NGio.logEvent(songs[curSelected].songName);
#end

// NGio.logEvent('Fresh');
FlxG.sound.play(Paths.sound('scrollMenu'), 0.4);

curSelected += change;
Expand Down
6 changes: 6 additions & 0 deletions source/HealthIcon.hx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ class HealthIcon extends FlxSprite
public function new(char:String = 'bf', isPlayer:Bool = false)
{
super();

loadGraphic(Paths.image('iconGrid'), true, 150, 150);

if (ModSubState.iconModVAR == true)
alpha = 0;

antialiasing = true;
animation.add('bf', [0, 1], 0, false, isPlayer);
animation.add('bf-car', [0, 1], 0, false, isPlayer);
Expand All @@ -35,6 +39,8 @@ class HealthIcon extends FlxSprite
animation.add('monster', [19, 20], 0, false, isPlayer);
animation.add('monster-christmas', [19, 20], 0, false, isPlayer);
animation.play(char);
if (char == null)
animation.play('face');
scrollFactor.set();
}

Expand Down
8 changes: 4 additions & 4 deletions source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class MainMenuState extends MusicBeatState

var menuItems:FlxTypedGroup<FlxSprite>;

var optionShit:Array<String> = ['story mode', 'freeplay', 'donate'];
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate', 'options'];

var magenta:FlxSprite;
var camFollow:FlxObject;
Expand All @@ -51,7 +51,7 @@ class MainMenuState extends MusicBeatState

var bg:FlxSprite = new FlxSprite(-80).loadGraphic(Paths.image('menuBG'));
bg.scrollFactor.x = 0;
bg.scrollFactor.y = 0.18;
bg.scrollFactor.y = 0.05;
bg.setGraphicSize(Std.int(bg.width * 1.1));
bg.updateHitbox();
bg.screenCenter();
Expand All @@ -63,7 +63,7 @@ class MainMenuState extends MusicBeatState

magenta = new FlxSprite(-80).loadGraphic(Paths.image('menuDesat'));
magenta.scrollFactor.x = 0;
magenta.scrollFactor.y = 0.18;
magenta.scrollFactor.y = bg.scrollFactor.y;
magenta.setGraphicSize(Std.int(magenta.width * 1.1));
magenta.updateHitbox();
magenta.screenCenter();
Expand Down Expand Up @@ -94,7 +94,7 @@ class MainMenuState extends MusicBeatState

FlxG.camera.follow(camFollow, null, 0.06);

var versionShit:FlxText = new FlxText(5, FlxG.height - 18, 0, Application.current.meta.get('version'), 12);
var versionShit:FlxText = new FlxText(5, FlxG.height - 18, 0, 'v' + Application.current.meta.get('version'), 12);
versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);
Expand Down
Loading

0 comments on commit 529ee0b

Please sign in to comment.