Skip to content

Commit

Permalink
Brazil update and fixed credits links
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShadowMario
ShadowMario committed Sep 16, 2024
1 parent 9b39fe8 commit 0a3521b
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 31 deletions.
Binary file added art/flashFiles/FNF_main_menu_assets_pt-BR.fla
View file
Binary file not shown.
5 changes: 2 additions & 3 deletions assets/translations/shared/data/pt-BR.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ charting_mode: "Modo Charter"
blueballed: "Broxadas: {1}"

// Main Menu
images/mainmenu/menu_story_mode: "images/mainmenu/menu_story_mode"
images/mainmenu/menu_freeplay: "images/mainmenu/menu_freeplay"
images/mainmenu/menu_credits: "images/mainmenu/menu_credits"
images/mainmenu/menu_story_mode: "images/pt-BR/mainmenu/menu_story_mode"
images/mainmenu/menu_credits: "images/pt-BR/mainmenu/menu_credits"

// Story Mode
images/Menu_Tracks: "images/pt-BR/Menu_Tracks"
Expand Down
Binary file added assets/translations/shared/images/pt-BR/mainmenu/menu_credits.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.
17 changes: 17 additions & 0 deletions assets/translations/shared/images/pt-BR/mainmenu/menu_credits.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="FNF_main_menu_assets_pt-BR.png">
<!-- Created with Adobe Animate version 23.0.2.103 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="credits idle0000" x="2" y="542" width="502" height="124"/>
<SubTexture name="credits idle0001" x="2" y="542" width="502" height="124"/>
<SubTexture name="credits idle0002" x="2" y="542" width="502" height="124"/>
<SubTexture name="credits idle0003" x="2" y="668" width="502" height="124"/>
<SubTexture name="credits idle0004" x="2" y="668" width="502" height="124"/>
<SubTexture name="credits idle0005" x="2" y="668" width="502" height="124"/>
<SubTexture name="credits idle0006" x="2" y="794" width="502" height="124"/>
<SubTexture name="credits idle0007" x="2" y="794" width="502" height="124"/>
<SubTexture name="credits idle0008" x="2" y="794" width="502" height="124"/>
<SubTexture name="credits selected0000" x="2" y="2" width="630" height="179" frameX="0" frameY="-1" frameWidth="631" frameHeight="180"/>
<SubTexture name="credits selected0001" x="2" y="183" width="631" height="178" frameX="0" frameY="-2" frameWidth="631" frameHeight="180"/>
<SubTexture name="credits selected0002" x="2" y="363" width="630" height="177" frameX="0" frameY="0" frameWidth="631" frameHeight="180"/>
</TextureAtlas>
Binary file added assets/translations/shared/images/pt-BR/mainmenu/menu_story_mode.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.
17 changes: 17 additions & 0 deletions assets/translations/shared/images/pt-BR/mainmenu/menu_story_mode.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="FNF_main_menu_assets_pt-BR.png">
<!-- Created with Adobe Animate version 23.0.2.103 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="story_mode idle0000" x="2" y="552" width="690" height="135"/>
<SubTexture name="story_mode idle0001" x="2" y="552" width="690" height="135"/>
<SubTexture name="story_mode idle0002" x="2" y="552" width="690" height="135"/>
<SubTexture name="story_mode idle0003" x="2" y="689" width="690" height="135"/>
<SubTexture name="story_mode idle0004" x="2" y="689" width="690" height="135"/>
<SubTexture name="story_mode idle0005" x="2" y="689" width="690" height="135"/>
<SubTexture name="story_mode idle0006" x="2" y="826" width="690" height="135"/>
<SubTexture name="story_mode idle0007" x="2" y="826" width="690" height="135"/>
<SubTexture name="story_mode idle0008" x="2" y="826" width="690" height="135"/>
<SubTexture name="story_mode selected0000" x="2" y="2" width="816" height="183" frameX="-1" frameY="-1" frameWidth="821" frameHeight="184"/>
<SubTexture name="story_mode selected0001" x="2" y="370" width="820" height="180" frameX="0" frameY="0" frameWidth="821" frameHeight="184"/>
<SubTexture name="story_mode selected0002" x="2" y="187" width="818" height="181" frameX="-3" frameY="-2" frameWidth="821" frameHeight="184"/>
</TextureAtlas>
16 changes: 7 additions & 9 deletions source/backend/Paths.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,7 @@ class Paths
public static var currentTrackedAssets:Map<String, FlxGraphic> = [];
static public function image(key:String, ?parentFolder:String = null, ?allowGPU:Bool = true):FlxGraphic
{
key = Language.getFileTranslation('images/$key');
if(key.lastIndexOf('.') < 0) key += '.png';

key = Language.getFileTranslation('images/$key') + '.png';
var bitmap:BitmapData = null;
if (currentTrackedAssets.exists(key))
{
Expand Down Expand Up @@ -303,9 +301,9 @@ class Paths
var xml:String = modsXml(key);
if(FileSystem.exists(xml)) xmlExists = true;

return FlxAtlasFrames.fromSparrow(imageLoaded, (xmlExists ? File.getContent(xml) : getPath('images/$key.xml', TEXT, parentFolder)));
return FlxAtlasFrames.fromSparrow(imageLoaded, (xmlExists ? File.getContent(xml) : getPath(Language.getFileTranslation('images/$key') + '.xml', TEXT, parentFolder)));
#else
return FlxAtlasFrames.fromSparrow(imageLoaded, getPath('images/$key.xml', TEXT, parentFolder));
return FlxAtlasFrames.fromSparrow(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.xml', TEXT, parentFolder));
#end
}

Expand All @@ -318,9 +316,9 @@ class Paths
var txt:String = modsTxt(key);
if(FileSystem.exists(txt)) txtExists = true;

return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, (txtExists ? File.getContent(txt) : getPath('images/$key.txt', TEXT, parentFolder)));
return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, (txtExists ? File.getContent(txt) : getPath(Language.getFileTranslation('images/$key') + '.txt', TEXT, parentFolder)));
#else
return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, getPath('images/$key.txt', TEXT, parentFolder));
return FlxAtlasFrames.fromSpriteSheetPacker(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.txt', TEXT, parentFolder));
#end
}

Expand All @@ -333,9 +331,9 @@ class Paths
var json:String = modsImagesJson(key);
if(FileSystem.exists(json)) jsonExists = true;

return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, (jsonExists ? File.getContent(json) : getPath('images/$key.json', TEXT, parentFolder)));
return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, (jsonExists ? File.getContent(json) : getPath(Language.getFileTranslation('images/$key') + '.json', TEXT, parentFolder)));
#else
return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, getPath('images/$key.json', TEXT, parentFolder));
return FlxAtlasFrames.fromTexturePackerJson(imageLoaded, getPath(Language.getFileTranslation('images/$key') + '.json', TEXT, parentFolder));
#end
}

Expand Down
38 changes: 19 additions & 19 deletions source/states/CreditsState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@ class CreditsState extends MusicBeatState

var defaultList:Array<Array<String>> = [ //Name - Icon name - Description - Link - BG Color
["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"],
["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://x.com/riverennn", "14967B"],
[""],
["Former Engine Members"],
["bb-panzu", "bb", "Ex-Programmer of Psych Engine", "https://twitter.com/bbsub3", "3E813A"],
["bb-panzu", "bb", "Ex-Programmer of Psych Engine", "https://x.com/bbsub3", "3E813A"],
[""],
["Engine Contributors"],
["crowplexus", "crowplexus", "HScript Iris, Input System v3, and Other PRs", "https://twitter.com/crowplexus", "CFCFCF"],
["Kamizeta", "kamizeta", "Creator of Pessy, Psych Engine's mascot.", "https://twitter.com/LittleCewwy", "D21C11"],
["MaxNeton", "maxneton", "Loading Screen Easter Egg Artist/Animator.", "https://twitter.com/MaxNeton", "3C2E4E"],
["Keoiki", "keoiki", "Note Splash Animations and Latin Alphabet", "https://twitter.com/Keoiki_", "D2D2D2"],
["SqirraRNG", "sqirra", "Crash Handler and Base code for\nChart Editor's Waveform", "https://twitter.com/gedehari", "E1843A"],
["EliteMasterEric", "mastereric", "Runtime Shaders support and Other PRs", "https://twitter.com/EliteMasterEric", "FFBD40"],
["MAJigsaw77", "majigsaw", ".MP4 Video Loader Library (hxvlc)", "https://twitter.com/MAJigsaw77", "5F5F5F"],
["Tahir Toprak Karabekiroglu", "tahir", "Note Splash Editor and Other PRs", "https://twitter.com/TahirKarabekir", "A04397"],
["iFlicky", "flicky", "Composer of Psync and Tea Time\nMade the Dialogue Sounds", "https://twitter.com/flicky_i", "9E29CF"],
["KadeDev", "kade", "Fixed some issues on Chart Editor and Other PRs", "https://twitter.com/kade0912", "64A250"],
["superpowers04", "superpowers04", "LUA JIT Fork", "https://twitter.com/superpowers04", "B957ED"],
["CheemsAndFriends", "cheems", "Creator of FlxAnimate", "https://twitter.com/CheemsnFriendos", "E1E1E1"],
["crowplexus", "crowplexus", "HScript Iris, Input System v3, and Other PRs", "https://github.com/crowplexus", "CFCFCF"],
["Kamizeta", "kamizeta", "Creator of Pessy, Psych Engine's mascot.", "https://www.instagram.com/cewweey/", "D21C11"],
["MaxNeton", "maxneton", "Loading Screen Easter Egg Artist/Animator.", "https://bsky.app/profile/maxneton.bsky.social","3C2E4E"],
["Keoiki", "keoiki", "Note Splash Animations and Latin Alphabet", "https://x.com/Keoiki_", "D2D2D2"],
["SqirraRNG", "sqirra", "Crash Handler and Base code for\nChart Editor's Waveform", "https://x.com/gedehari", "E1843A"],
["EliteMasterEric", "mastereric", "Runtime Shaders support and Other PRs", "https://x.com/EliteMasterEric", "FFBD40"],
["MAJigsaw77", "majigsaw", ".MP4 Video Loader Library (hxvlc)", "https://x.com/MAJigsaw77", "5F5F5F"],
["Tahir Toprak Karabekiroglu", "tahir", "Note Splash Editor and Other PRs", "https://x.com/TahirKarabekir", "A04397"],
["iFlicky", "flicky", "Composer of Psync and Tea Time\nAnd some sound effects", "https://x.com/flicky_i", "9E29CF"],
["KadeDev", "kade", "Fixed some issues on Chart Editor and Other PRs", "https://x.com/kade0912", "64A250"],
["superpowers04", "superpowers04", "LUA JIT Fork", "https://x.com/superpowers04", "B957ED"],
["CheemsAndFriends", "cheems", "Creator of FlxAnimate", "https://x.com/CheemsnFriendos", "E1E1E1"],
[""],
["Funkin' Crew"],
["ninjamuffin99", "ninjamuffin99", "Programmer of Friday Night Funkin'", "https://twitter.com/ninja_muffin99", "CF2D2D"],
["PhantomArcade", "phantomarcade", "Animator of Friday Night Funkin'", "https://twitter.com/PhantomArcade3K", "FADC45"],
["evilsk8r", "evilsk8r", "Artist of Friday Night Funkin'", "https://twitter.com/evilsk8r", "5ABD4B"],
["kawaisprite", "kawaisprite", "Composer of Friday Night Funkin'", "https://twitter.com/kawaisprite", "378FC7"],
["ninjamuffin99", "ninjamuffin99", "Programmer of Friday Night Funkin'", "https://x.com/ninja_muffin99", "CF2D2D"],
["PhantomArcade", "phantomarcade", "Animator of Friday Night Funkin'", "https://x.com/PhantomArcade3K", "FADC45"],
["evilsk8r", "evilsk8r", "Artist of Friday Night Funkin'", "https://x.com/evilsk8r", "5ABD4B"],
["kawaisprite", "kawaisprite", "Composer of Friday Night Funkin'", "https://x.com/kawaisprite", "378FC7"],
[""],
["Psych Engine Discord"],
["Join the Psych Ward!", "discord", "", "https://discord.gg/2ka77eMXDv", "5165F6"]
Expand Down

0 comments on commit 0a3521b

Please sign in to comment.