AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ninjamuffin99/ld47

Browse Source
This commit is contained in:
Cameron Taylor
2021-01-14 23:39:49 -05:00
parent 3fffb94661 88a8918143
commit 73fc03f948
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/MainMenuState.hx
View File

@ -89,13 +89,6 @@ class MainMenuState extends MusicBeatState
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);
if (versionShit.text.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
{
trace('OLD VERSION!');
FlxG.switchState(new OutdatedSubState());
}
// NG.core.calls.event.logEvent('swag').send();
changeItem();

11
source/PlayState.hx
View File

@ -11,7 +11,6 @@ import flixel.FlxSprite;
import flixel.FlxState;
import flixel.FlxSubState;
import flixel.addons.display.FlxGridOverlay;
import flixel.addons.transition.FlxTransitionableState;
import flixel.graphics.atlas.FlxAtlas;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup.FlxTypedGroup;
@ -163,11 +162,11 @@ class PlayState extends MusicBeatState
{
curStage = 'philly';
var bg:FlxSprite = new FlxSprite(-100).loadGraphic('assets/images/sky.png');
var bg:FlxSprite = new FlxSprite(-100).loadGraphic('assets/images/philly/sky.png');
bg.scrollFactor.set(0.1, 0.1);
add(bg);
var city:FlxSprite = new FlxSprite(-10).loadGraphic('assets/images/city.png');
var city:FlxSprite = new FlxSprite(-10).loadGraphic('assets/images/philly/city.png');
city.scrollFactor.set(0.3, 0.3);
city.setGraphicSize(Std.int(city.width * 0.85));
city.updateHitbox();
@ -186,10 +185,10 @@ class PlayState extends MusicBeatState
phillyCityLights.add(light);
}
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic('assets/images/behindTrain.png');
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic('assets/images/philly/behindTrain.png');
add(streetBehind);
phillyTrain = new FlxSprite(2000, 360).loadGraphic('assets/images/train.png');
phillyTrain = new FlxSprite(2000, 360).loadGraphic('assets/images/philly/train.png');
add(phillyTrain);
trainSound = new FlxSound().loadEmbedded('assets/sounds/train_passes' + TitleState.soundExt);
@ -197,7 +196,7 @@ class PlayState extends MusicBeatState
// var cityLights:FlxSprite = new FlxSprite().loadGraphic(AssetPaths.win0.png);
var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic('assets/images/street.png');
var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic('assets/images/philly/street.png');
add(street);
}
else if (SONG.song.toLowerCase() == 'milf' || SONG.song.toLowerCase() == 'satin-panties' || SONG.song.toLowerCase() == 'high')

18
source/TitleState.hx
View File

@ -20,9 +20,13 @@ import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import io.newgrounds.NG;
import lime.app.Application;
import lime.utils.Assets;
import polymod.Polymod;
using StringTools;
class TitleState extends MusicBeatState
{
static var initialized:Bool = false;
@ -261,7 +265,19 @@ class TitleState extends MusicBeatState
new FlxTimer().start(2, function(tmr:FlxTimer)
{
FlxG.switchState(new MainMenuState());
// Check if version is outdated
var version:String = "v" + Application.current.meta.get('version');
if (version.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
{
trace('OLD VERSION!');
FlxG.switchState(new OutdatedSubState());
}
else
{
FlxG.switchState(new MainMenuState());
}
});
// FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7);
}