Merge branch 'KadeDev:master' into master
This commit is contained in:
CyndaquilDAC
@@ -32,7 +32,6 @@ install:
|
||||
- haxelib run lime rebuild extension-webm macos
|
||||
- haxelib install linc_luajit
|
||||
- haxelib install actuate
|
||||
- haxelib git extension-webm https://github.com/KadeDev/extension-webm
|
||||
- haxelib list
|
||||
- cd /Users/appveyor/projects/kade-engine-macos
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ install:
|
||||
- haxelib git extension-webm https://github.com/KadeDev/extension-webm
|
||||
- haxelib run lime rebuild extension-webm windows
|
||||
- haxelib install linc_luajit
|
||||
- haxelib install actuate
|
||||
- haxelib install actuate
|
||||
#- haxelib git extension-webm https://github.com/KadeDev/extension-webm
|
||||
#- haxelib run lime rebuild extension-webm windows
|
||||
#why here's dublicate lmao
|
||||
|
||||
7
assets/preload/data/weekNames.txt
Normal file
7
assets/preload/data/weekNames.txt
Normal file
@@ -0,0 +1,7 @@
|
||||
Tutorial
|
||||
Daddy Dearest
|
||||
Spooky Month
|
||||
PICO
|
||||
MOMMY MUST MURDER
|
||||
RED SNOW
|
||||
Hating Simulator ft. Moawling
|
||||
BIN
assets/preload/music/freakyMenu.mp3
Normal file
BIN
assets/preload/music/freakyMenu.mp3
Normal file
Binary file not shown.
BIN
assets/shared/sounds/CLAP.mp3
Normal file
BIN
assets/shared/sounds/CLAP.mp3
Normal file
Binary file not shown.
BIN
assets/shared/sounds/SNAP.mp3
Normal file
BIN
assets/shared/sounds/SNAP.mp3
Normal file
Binary file not shown.
@@ -30,26 +30,19 @@
|
||||
- `haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc`
|
||||
- `haxelib install actuate`
|
||||
- `haxelib git extension-webm https://github.com/KadeDev/extension-webm`
|
||||
- `lime rebuild extension-webm windows`
|
||||
- `lime rebuild extension-webm <ie. windows, macos, linux>`
|
||||
|
||||
### Windows-only dependencies (only for building *to* Windows. Building html5 on Windows does not require this)
|
||||
If you are planning to build for Windows, you also need to install **Visual Studio 2019**. While installing it, *don't click on any of the options to install workloads*. Instead, go to the **individual components** tab and choose the following:
|
||||
|
||||
- MSVC v142 - VS 2019 C++ x64/x86 build tools
|
||||
- MSVC v141 - VS 2017 C++ x64/x86 build tools
|
||||
- Windows SDK (10.0.17763.0)
|
||||
- C++ Profiling tools
|
||||
- C++ CMake tools for windows
|
||||
- C++ ATL for v142 build tools (x86 & x64)
|
||||
- C++ MFC for v142 build tools (x86 & x64)
|
||||
- C++/CLI support for v142 build tools (14.21)
|
||||
- C++ Modules for v142 build tools (x64/x86)
|
||||
- Clang Compiler for Windows
|
||||
- Windows 10 SDK (10.0.17134.0)
|
||||
- Windows 10 SDK (10.0.16299.0)
|
||||
- MSVC v141 - VS 2017 C++ x64/x86 build tools
|
||||
- MSVC v140 - VS 2015 C++ build tools (v14.00)
|
||||
|
||||
This will install about 22 GB of crap, but is necessary to build for Windows.
|
||||
This will install about 7 GB of crap, but is necessary to build for Windows.
|
||||
|
||||
### macOS-only dependencies (these are required for building on macOS at all, including html5.)
|
||||
If you are running macOS, you'll need to install Xcode. You can download it from the macOS App Store or from the [Xcode website](https://developer.apple.com/xcode/).
|
||||
|
||||
@@ -109,32 +109,21 @@ var weekCharacters:Array<Dynamic> = [
|
||||
|
||||
### Step 4. Week Names
|
||||
|
||||
Underneath the song list, there should be another array called `weekNames`. Creating a new line in that array, just enter a string that represents what you want the week to be called.
|
||||
In `assets/preload/data`, there should be a .txt file called `weekNames`. Creating a new line in that file, just enter a string that represents what you want the week to be called.
|
||||
|
||||
Example
|
||||
---
|
||||
|
||||
---
|
||||
```haxe
|
||||
var weekNames:Array<String> = [
|
||||
|
||||
"How to Funk",
|
||||
|
||||
"Daddy dearest",
|
||||
|
||||
"Spooky Month",
|
||||
|
||||
"PICO",
|
||||
|
||||
"Mommy Must Murder",
|
||||
|
||||
"Red Snow",
|
||||
|
||||
"Hating Simulator ft. Moawlings",
|
||||
|
||||
"Tankman"
|
||||
|
||||
];
|
||||
```
|
||||
Tutorial
|
||||
Daddy Dearest
|
||||
Spooky Month
|
||||
PICO
|
||||
MOMMY MUST MURDER
|
||||
RED SNOW
|
||||
Hating Simulator ft. Moawling
|
||||
TANKMAN
|
||||
```
|
||||
|
||||
---
|
||||
@@ -143,22 +132,18 @@ var weekNames:Array<String> = [
|
||||
|
||||
### Step 5. Graphics
|
||||
|
||||
Displaying a week icon for your custom week is as simple as dropping a .png into `assets/images/storymenu`. Rename the file to `week7.png`, `week8.png`, etc.
|
||||
Displaying a week icon for your custom week is as simple as dropping a .png into `assets/preload/images/storymenu`. Rename the file to `week7.png`, `week8.png`, etc.
|
||||
|
||||
Example
|
||||
---
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
NOTE: You will have to add a new item to `weekUnlocked`, so that the week is playable.
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
 \* *for this screenshot I removed tankman from weekCharacters as it would crash because I don't have a tankman character added*
|
||||
### Conclusion
|
||||
|
||||
If you followed all of the steps correctly, you have successfully created a new week in the Story Mode.
|
||||
|
||||
@@ -318,10 +318,6 @@ class FreeplayState extends MusicBeatState
|
||||
|
||||
function changeDiff(change:Int = 0)
|
||||
{
|
||||
|
||||
if (songs[curSelected += change] == null)
|
||||
return;
|
||||
|
||||
curDifficulty += change;
|
||||
|
||||
if (curDifficulty < 0)
|
||||
@@ -353,9 +349,6 @@ class FreeplayState extends MusicBeatState
|
||||
// NGio.logEvent('Fresh');
|
||||
FlxG.sound.play(Paths.sound('scrollMenu'), 0.4);
|
||||
|
||||
if (songs[curSelected += change] == null)
|
||||
return;
|
||||
|
||||
curSelected += change;
|
||||
|
||||
if (curSelected < 0)
|
||||
|
||||
@@ -240,7 +240,10 @@ class PauseSubState extends MusicBeatSubstate
|
||||
if (FlxG.save.data.fpsCap > 290)
|
||||
(cast (Lib.current.getChildAt(0), Main)).setFPSCap(290);
|
||||
|
||||
FlxG.switchState(new MainMenuState());
|
||||
if (PlayState.isStoryMode)
|
||||
FlxG.switchState(new StoryMenuState());
|
||||
else
|
||||
FlxG.switchState(new FreeplayState());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -832,6 +832,15 @@ class PlayState extends MusicBeatState
|
||||
dad.y += 360;
|
||||
camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
|
||||
case 'spirit':
|
||||
if(FlxG.save.data.distractions){
|
||||
// trailArea.scrollFactor.set();
|
||||
var evilTrail = new FlxTrail(dad, null, 4, 24, 0.3, 0.069);
|
||||
// evilTrail.changeValuesEnabled(false, false, false, false);
|
||||
// evilTrail.changeGraphic()
|
||||
add(evilTrail);
|
||||
// evilTrail.scrollFactor.set(1.1, 1.1);
|
||||
}
|
||||
|
||||
dad.x -= 150;
|
||||
dad.y += 100;
|
||||
camPos.set(dad.getGraphicMidpoint().x + 300, dad.getGraphicMidpoint().y);
|
||||
@@ -864,16 +873,6 @@ class PlayState extends MusicBeatState
|
||||
gf.x += 180;
|
||||
gf.y += 300;
|
||||
case 'schoolEvil':
|
||||
if(FlxG.save.data.distractions){
|
||||
// trailArea.scrollFactor.set();
|
||||
var evilTrail = new FlxTrail(dad, null, 4, 24, 0.3, 0.069);
|
||||
// evilTrail.changeValuesEnabled(false, false, false, false);
|
||||
// evilTrail.changeGraphic()
|
||||
add(evilTrail);
|
||||
// evilTrail.scrollFactor.set(1.1, 1.1);
|
||||
}
|
||||
|
||||
|
||||
boyfriend.x += 200;
|
||||
boyfriend.y += 220;
|
||||
gf.x += 180;
|
||||
|
||||
@@ -57,6 +57,7 @@ class ResultsScreen extends FlxSubState
|
||||
music = new FlxSound().loadEmbedded(Paths.music('breakfast'), true, true);
|
||||
music.volume = 0;
|
||||
music.play(false, FlxG.random.int(0, Std.int(music.length / 2)));
|
||||
FlxG.sound.list.add(music);
|
||||
|
||||
background.alpha = 0;
|
||||
|
||||
|
||||
@@ -50,15 +50,7 @@ class StoryMenuState extends MusicBeatState
|
||||
['senpai', 'bf', 'gf']
|
||||
];
|
||||
|
||||
var weekNames:Array<String> = [
|
||||
"",
|
||||
"Daddy Dearest",
|
||||
"Spooky Month",
|
||||
"PICO",
|
||||
"MOMMY MUST MURDER",
|
||||
"RED SNOW",
|
||||
"Hating Simulator ft. Moawling"
|
||||
];
|
||||
var weekNames:Array<String> = CoolUtil.coolTextFile(Paths.txt('data/weekNames'));
|
||||
|
||||
var txtWeekTitle:FlxText;
|
||||
|
||||
|
||||
@@ -165,8 +165,7 @@ class TitleState extends MusicBeatState
|
||||
logoBl = new FlxSprite(-150, 1500);
|
||||
logoBl.frames = Paths.getSparrowAtlas('KadeEngineLogoBumpin');
|
||||
logoBl.antialiasing = true;
|
||||
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
|
||||
logoBl.animation.play('bump');
|
||||
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24, false);
|
||||
logoBl.updateHitbox();
|
||||
// logoBl.screenCenter();
|
||||
// logoBl.color = FlxColor.BLACK;
|
||||
@@ -174,8 +173,7 @@ class TitleState extends MusicBeatState
|
||||
logoBl = new FlxSprite(-150, -100);
|
||||
logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
|
||||
logoBl.antialiasing = true;
|
||||
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24);
|
||||
logoBl.animation.play('bump');
|
||||
logoBl.animation.addByPrefix('bump', 'logo bumpin', 24, false);
|
||||
logoBl.updateHitbox();
|
||||
// logoBl.screenCenter();
|
||||
// logoBl.color = FlxColor.BLACK;
|
||||
@@ -378,7 +376,7 @@ class TitleState extends MusicBeatState
|
||||
{
|
||||
super.beatHit();
|
||||
|
||||
logoBl.animation.play('bump');
|
||||
logoBl.animation.play('bump', true);
|
||||
danceLeft = !danceLeft;
|
||||
|
||||
if (danceLeft)
|
||||
|
||||
Reference in New Issue
Block a user