Skip to content

Commit

Permalink
added and changed some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
RedderWindower committed Nov 25, 2024
1 parent 69d44dc commit 2bd5b31
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 34 deletions.
Binary file modified assets/shared/images/bad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/coolLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/shared/images/coolLogo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='utf-8'?>
<TextureAtlas imagePath="coolLogo.png">
<SubTexture name="logoBounce0000" x="0" y="926" width="511" height="195" frameX="-385" frameY="-264" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0001" x="740" y="0" width="626" height="237" frameX="-328" frameY="-243" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0002" x="0" y="0" width="740" height="281" frameX="-271" frameY="-221" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0003" x="0" y="281" width="633" height="240" frameX="-324" frameY="-241" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0004" x="740" y="237" width="577" height="219" frameX="-352" frameY="-252" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0005" x="0" y="521" width="545" height="207" frameX="-368" frameY="-258" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0006" x="545" y="521" width="531" height="201" frameX="-375" frameY="-261" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0007" x="0" y="728" width="521" height="198" frameX="-380" frameY="-262" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0008" x="521" y="728" width="517" height="197" frameX="-382" frameY="-263" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0009" x="511" y="926" width="515" height="195" frameX="-383" frameY="-264" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0010" x="0" y="1121" width="513" height="195" frameX="-384" frameY="-264" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0011" x="513" y="1121" width="513" height="195" frameX="-384" frameY="-264" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0012" x="1366" y="0" width="511" height="195" frameX="-385" frameY="-264" frameWidth="1280" frameHeight="720" />
<SubTexture name="logoBounce0013" x="0" y="926" width="511" height="195" frameX="-385" frameY="-264" frameWidth="1280" frameHeight="720" />
</TextureAtlas>
Binary file added assets/shared/images/credits/windows.png
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/shared/images/good.png
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/shared/images/shit.png
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/shared/images/sick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gitVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.3
0.1.0
3 changes: 3 additions & 0 deletions source/states/CreditsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ class CreditsState extends MusicBeatState
#end

var defaultList:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
['Red Engine Team'],
['RedWindows', 'windows', 'Main Programmer and Head of Red Engine', 'https://youtube.com/@TheRedWindower', 'FF2D00'],
[''],
['Psych Engine Team'],
['Shadow Mario', 'shadowmario', 'Main Programmer and Head of Psych Engine', 'https://ko-fi.com/shadowmario', '444444'],
['Riveren', 'riveren', 'Main Artist/Animator of Psych Engine', 'https://twitter.com/riverennn', '14967B'],
Expand Down
19 changes: 5 additions & 14 deletions source/states/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@ import options.OptionsState;
class MainMenuState extends MusicBeatState
{
public static var psychEngineVersion:String = '0.7.3'; // This is also used for Discord RPC
public static var redEngineVersion:String = '0.1.0';
public static var curSelected:Int = 0;

var menuItems:FlxTypedGroup<FlxSprite>;

var optionShit:Array<String> = [
'story_mode',
'freeplay',
#if MODS_ALLOWED 'mods', #end
#if ACHIEVEMENTS_ALLOWED 'awards', #end
'credits',
#if !switch 'donate', #end
'options'
];

Expand Down Expand Up @@ -87,6 +85,10 @@ class MainMenuState extends MusicBeatState
menuItem.screenCenter(X);
}

var REVer:FlxText = new FlxText(12, FlxG.height - 64, 0, "Red Engine v" + redEngineVersion, 12);
REVer.scrollFactor.set();
REVer.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(REVer);
var psychVer:FlxText = new FlxText(12, FlxG.height - 44, 0, "Psych Engine v" + psychEngineVersion, 12);
psychVer.scrollFactor.set();
psychVer.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
Expand Down Expand Up @@ -161,17 +163,6 @@ class MainMenuState extends MusicBeatState
MusicBeatState.switchState(new StoryMenuState());
case 'freeplay':
MusicBeatState.switchState(new FreeplayState());

#if MODS_ALLOWED
case 'mods':
MusicBeatState.switchState(new ModsMenuState());
#end

#if ACHIEVEMENTS_ALLOWED
case 'awards':
MusicBeatState.switchState(new AchievementsMenuState());
#end

case 'credits':
MusicBeatState.switchState(new CreditsState());
case 'options':
Expand Down
20 changes: 10 additions & 10 deletions source/states/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ class PlayState extends MusicBeatState
public static var STRUM_X_MIDDLESCROLL = -278;

public static var ratingStuff:Array<Dynamic> = [
['You Suck!', 0.2], //From 0% to 19%
['Shit', 0.4], //From 20% to 39%
['Bad', 0.5], //From 40% to 49%
['Bruh', 0.6], //From 50% to 59%
['Meh', 0.69], //From 60% to 68%
['Nice', 0.7], //69%
['Good', 0.8], //From 70% to 79%
['Great', 0.9], //From 80% to 89%
['Sick!', 1], //From 90% to 99%
['Perfect!!', 1] //The value on this one isn't used actually, since Perfect is always "1"
['You Suck Ass Cheeks', 0.2], //From 0% to 19%
['Could Never', 0.4], //From 20% to 39%
['Eh Ig', 0.5], //From 40% to 49%
['Really?', 0.6], //From 50% to 59%
['SMH', 0.69], //From 60% to 68%
['Sweet', 0.7], //69%
['Now Thats Average', 0.8], //From 70% to 79%
['Great Job', 0.9], //From 80% to 89%
['Awesome!', 1], //From 90% to 99%
['RADICAL!!', 1] //The value on this one isn't used actually, since Perfect is always "1"
];

//event variables
Expand Down
17 changes: 8 additions & 9 deletions source/states/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class TitleState extends MusicBeatState
#if CHECK_FOR_UPDATES
if(ClientPrefs.data.checkForUpdates && !closedState) {
trace('checking for update');
var http = new haxe.Http("https://raw.githubusercontent.com/ShadowMario/FNF-PsychEngine/main/gitVersion.txt");
var http = new haxe.Http("https://raw.githubusercontent.com/RedWindower/Red-Engine/main/gitVersion.txt");

http.onData = function (data:String)
{
Expand Down Expand Up @@ -206,10 +206,10 @@ class TitleState extends MusicBeatState
add(bg);

logoBl = new FlxSprite(titleJSON.titlex, titleJSON.titley);
logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
logoBl.frames = Paths.getSparrowAtlas('coolLogo');
logoBl.antialiasing = ClientPrefs.data.antialiasing;

logoBl.animation.addByPrefix('bump', 'logo bumpin', 24, false);
logoBl.animation.addByPrefix('bump', 'logoBounce', 24, false);
logoBl.animation.play('bump');
logoBl.updateHitbox();
// logoBl.screenCenter();
Expand Down Expand Up @@ -549,14 +549,13 @@ class TitleState extends MusicBeatState
FlxG.sound.music.fadeIn(4, 0, 0.7);
case 2:
#if PSYCH_WATERMARKS
createCoolText(['Psych Engine by'], 40);
createCoolText(['Red Engine by'], 40);
#else
createCoolText(['ninjamuffin99', 'phantomArcade', 'kawaisprite', 'evilsk8er']);
#end
case 4:
#if PSYCH_WATERMARKS
addMoreText('Shadow Mario', 40);
addMoreText('Riveren', 40);
addMoreText('RedWindows', 40);
#else
addMoreText('present');
#end
Expand All @@ -581,11 +580,11 @@ class TitleState extends MusicBeatState
case 13:
deleteCoolText();
case 14:
addMoreText('Friday');
addMoreText('FNF');
case 15:
addMoreText('Night');
addMoreText('Red');
case 16:
addMoreText('Funkin'); // credTextShit.text += '\nFunkin';
addMoreText('Engine'); // credTextShit.text += '\nFunkin';

case 17:
skipIntro();
Expand Down

0 comments on commit 2bd5b31

Please sign in to comment.