Skip to content

Commit

Permalink
Merge branch 'experimental' into the-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@LarryFrosty
LarryFrosty authored Oct 1, 2024
2 parents c5b8143 + 9569db6 commit 5a80fd9
Show file tree
Hide file tree
Showing 69 changed files with 1,276 additions and 1,158 deletions.
8 changes: 5 additions & 3 deletions Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<define name="ACHIEVEMENTS_ALLOWED" />
<define name="DISCORD_ALLOWED" />
<define name="TRANSLATIONS_ALLOWED" />
<define name="IRIS_DEBUG"/>

<define name="SHOW_LOADING_SCREEN" />
<define name="PSYCH_WATERMARKS"/> <!-- DELETE THIS TO REMOVE THE PSYCH LOGO FROM LOADING SCREEN -->
Expand Down Expand Up @@ -109,9 +110,9 @@

<!--Psych stuff needed-->
<haxelib name="linc_luajit" if="LUA_ALLOWED"/>
<haxelib name="SScript" if="HSCRIPT_ALLOWED" version="19.0.618"/>
<haxelib name="hxvlc" if="VIDEOS_ALLOWED"/>
<haxelib name="hxdiscord_rpc" if="DISCORD_ALLOWED"/>
<haxelib name="hscript-iris" if="HSCRIPT_ALLOWED" version="1.1.0"/>
<haxelib name="hxvlc" if="VIDEOS_ALLOWED" version="1.8.2"/>
<haxelib name="hxdiscord_rpc" version="1.2.4" if="DISCORD_ALLOWED"/>
<haxelib name="flxanimate"/>

<!-- Disable Discord IO Thread -->
Expand All @@ -121,6 +122,7 @@
<!-- Enables a terminal log prompt on debug builds -->
<haxelib name="hxcpp-debug-server" if="debug"/>
<haxedef name="HXC_LIBVLC_LOGGING" if="VIDEOS_ALLOWED debug" />
<haxedef name="HXVLC_NO_SHARE_DIRECTORY" if="VIDEOS_ALLOWED" />

<!-- ______________________________ Haxedefines _____________________________ -->

Expand Down
Binary file added art/flashFiles/FNF_main_menu_assets_pt-BR.fla
View file
Binary file not shown.
Binary file added art/flashFiles/PsychGF.fla
View file
Binary file not shown.
Binary file removed art/flashFiles/PsychGF2.fla
View file
Binary file not shown.
Binary file added assets/secrets/images/PessyBump.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.
35 changes: 35 additions & 0 deletions assets/secrets/images/PessyBump.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="PessyBump.png">
<!-- Created with Adobe Animate version 23.0.2.103 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Pessy Title Bump0000" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0001" x="1076" y="2" width="539" height="563" frameX="0" frameY="-6" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0002" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0003" x="1617" y="2" width="539" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0004" x="2691" y="562" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0005" x="2691" y="1120" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0006" x="2154" y="1122" width="535" height="556" frameX="0" frameY="-13" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0007" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0008" x="2" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0009" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0010" x="1076" y="567" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0011" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0012" x="2" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0013" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0014" x="2" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0015" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0016" x="1613" y="567" width="539" height="557" frameX="0" frameY="-12" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0017" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0018" x="1613" y="1126" width="539" height="555" frameX="0" frameY="-14" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0019" x="2158" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0020" x="2695" y="2" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0021" x="2154" y="562" width="535" height="558" frameX="0" frameY="-11" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0022" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0023" x="539" y="1144" width="535" height="562" frameX="0" frameY="-7" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0024" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0025" x="1076" y="1136" width="535" height="567" frameX="0" frameY="-2" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0026" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0027" x="539" y="2" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0028" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
<SubTexture name="Pessy Title Bump0029" x="539" y="573" width="535" height="569" frameX="0" frameY="0" frameWidth="539" frameHeight="569"/>
</TextureAtlas>
Binary file removed assets/secrets/images/RiverBump.png
View file
Binary file not shown.
35 changes: 0 additions & 35 deletions assets/secrets/images/RiverBump.xml
View file

This file was deleted.

19 changes: 19 additions & 0 deletions assets/secrets/images/ShadowBump.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,23 @@
<SubTexture name="Shadow Title Bump0003" x="393" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0004" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0005" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0006" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0007" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0008" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0009" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0010" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0011" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0012" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0013" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0014" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0015" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0016" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0017" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0018" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0019" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0020" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0021" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0022" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0023" x="782" y="4" width="385" height="582"/>
<SubTexture name="Shadow Title Bump0024" x="782" y="4" width="385" height="582"/>
</TextureAtlas>
Binary file added assets/secrets/images/ZRiverBump.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.
20 changes: 20 additions & 0 deletions assets/secrets/images/ZRiverBump.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="ZRiverBump.png">
<!-- Created with Adobe Animate version 22.0.7.214 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="River Title Bump0000" x="438" y="667" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0001" x="438" y="1322" width="436" height="653" frameX="0" frameY="-10" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0002" x="876" y="1321" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0003" x="1312" y="1330" width="434" height="646" frameX="0" frameY="-17" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0004" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0005" x="876" y="667" width="434" height="652" frameX="0" frameY="-11" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0006" x="2" y="667" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0007" x="2" y="1327" width="434" height="658" frameX="0" frameY="-5" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0008" x="1746" y="2" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0009" x="1746" y="666" width="434" height="662" frameX="0" frameY="-1" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0010" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0011" x="2" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0012" x="438" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0013" x="874" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
<SubTexture name="River Title Bump0014" x="1310" y="2" width="434" height="663" frameX="0" frameY="0" frameWidth="436" frameHeight="663"/>
</TextureAtlas>
Binary file added assets/secrets/sounds/JinglePessy.mp3
View file
Binary file not shown.
Binary file added assets/secrets/sounds/JinglePessy.ogg
View file
Binary file not shown.
Binary file modified assets/secrets/sounds/JingleRiver.mp3
View file
Binary file not shown.
Binary file modified assets/secrets/sounds/JingleRiver.ogg
View file
Binary file not shown.
Binary file added assets/shared/images/achievements/pessy_easter_egg.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.
Binary file added assets/shared/images/achievements/weekend1_nomiss.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.
Binary file added assets/shared/images/credits/majigsaw.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.
21 changes: 13 additions & 8 deletions assets/shared/images/gfDanceTitle.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"titlex":-150,
"titley":-100,
"startx":100,
"starty":576,
"gfx":512,
"gfy":40,
"backgroundSprite":"",
"bpm":102
"titlex": -150,
"titley": -100,
"startx": 100,
"starty": 576,
"gfx": 512,
"gfy": 40,
"backgroundSprite": "",
"bpm": 102,

"animation": "gfDance",
"dance_left": [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14],
"dance_right": [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29],
"idle": false
}
9 changes: 6 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 Expand Up @@ -87,6 +86,8 @@ achievement_week6_nomiss: "Novo Recorde!!"
description_week6_nomiss: "Complete a Week 6 no Modo Difícil e sem errar."
achievement_week7_nomiss: "Filho da P..."
description_week7_nomiss: "Complete a Week 7 no Modo Difícil e sem errar."
achievement_weekend1_nomiss: "Briga sem Perder Amizade"
description_weekend1_nomiss: "Complete a Weekend 1 no Modo Difícil e sem errar."
achievement_ur_bad: "Pontuação Desastrosa!"
description_ur_bad: "Complete uma Música com uma precisão menor que 20%."
achievement_ur_good: "Perfeccionista"
Expand All @@ -103,6 +104,8 @@ achievement_toastie: "PC de Torradeira"
description_toastie: "Jogando num belo de um PC da Xuxa, hein?"
achievement_debugger: "Modo Debug"
description_debugger: "Complete a Música "Test" através do Chart Editor."
achievement_pessy_easter_egg: "Garota de Programação"
description_pessy_easter_egg: "Hihi, você me encontrou~!"

// Options
options_note_colors: "Coloração das Notas"
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="556" width="690" height="135"/>
<SubTexture name="story_mode idle0001" x="2" y="556" width="690" height="135"/>
<SubTexture name="story_mode idle0002" x="2" y="556" width="690" height="135"/>
<SubTexture name="story_mode idle0003" x="2" y="693" width="690" height="135"/>
<SubTexture name="story_mode idle0004" x="2" y="693" width="690" height="135"/>
<SubTexture name="story_mode idle0005" x="2" y="693" width="690" height="135"/>
<SubTexture name="story_mode idle0006" x="2" y="830" width="690" height="135"/>
<SubTexture name="story_mode idle0007" x="2" y="830" width="690" height="135"/>
<SubTexture name="story_mode idle0008" x="2" y="830" width="690" height="135"/>
<SubTexture name="story_mode selected0000" x="2" y="189" width="809" height="183" frameX="-5" frameY="0" frameWidth="816" frameHeight="188"/>
<SubTexture name="story_mode selected0001" x="2" y="374" width="811" height="180" frameX="0" frameY="0" frameWidth="816" frameHeight="188"/>
<SubTexture name="story_mode selected0002" x="2" y="2" width="811" height="185" frameX="-5" frameY="-3" frameWidth="816" frameHeight="188"/>
</TextureAtlas>
Loading

0 comments on commit 5a80fd9

Please sign in to comment.