diff --git a/art/flashFiles/FNF_main_menu_assets.fla b/art/flashFiles/FNF_main_menu_assets.fla
index af724a86..80d3615e 100644
Binary files a/art/flashFiles/FNF_main_menu_assets.fla and b/art/flashFiles/FNF_main_menu_assets.fla differ
diff --git a/art/flashFiles/TitleEnter.fla b/art/flashFiles/TitleEnter.fla
index 2605cfd3..b52209bc 100644
Binary files a/art/flashFiles/TitleEnter.fla and b/art/flashFiles/TitleEnter.fla differ
diff --git a/art/flashFiles/campaign_menu_UI_assets.fla b/art/flashFiles/campaign_menu_UI_assets.fla
index 5252e509..8aa01aee 100644
Binary files a/art/flashFiles/campaign_menu_UI_assets.fla and b/art/flashFiles/campaign_menu_UI_assets.fla differ
diff --git a/assets/data/editors/layouts/stage/characterEditScreen.xml b/assets/data/editors/layouts/stage/characterEditScreen.xml
index 31f0e5ea..1836923b 100644
--- a/assets/data/editors/layouts/stage/characterEditScreen.xml
+++ b/assets/data/editors/layouts/stage/characterEditScreen.xml
@@ -51,7 +51,7 @@
-
+
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/credits.png b/assets/languages/pl/assets/images/menus/mainmenu/credits.png
new file mode 100644
index 00000000..668d9f8f
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/mainmenu/credits.png differ
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/credits.xml b/assets/languages/pl/assets/images/menus/mainmenu/credits.xml
new file mode 100644
index 00000000..23e50a85
--- /dev/null
+++ b/assets/languages/pl/assets/images/menus/mainmenu/credits.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/freeplay.png b/assets/languages/pl/assets/images/menus/mainmenu/freeplay.png
new file mode 100644
index 00000000..14b05822
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/mainmenu/freeplay.png differ
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/freeplay.xml b/assets/languages/pl/assets/images/menus/mainmenu/freeplay.xml
new file mode 100644
index 00000000..d54fb418
--- /dev/null
+++ b/assets/languages/pl/assets/images/menus/mainmenu/freeplay.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/options.png b/assets/languages/pl/assets/images/menus/mainmenu/options.png
new file mode 100644
index 00000000..94af72c2
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/mainmenu/options.png differ
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/options.xml b/assets/languages/pl/assets/images/menus/mainmenu/options.xml
new file mode 100644
index 00000000..d5b15640
--- /dev/null
+++ b/assets/languages/pl/assets/images/menus/mainmenu/options.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/story mode.png b/assets/languages/pl/assets/images/menus/mainmenu/story mode.png
new file mode 100644
index 00000000..dfac01e9
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/mainmenu/story mode.png differ
diff --git a/assets/languages/pl/assets/images/menus/mainmenu/story mode.xml b/assets/languages/pl/assets/images/menus/mainmenu/story mode.xml
new file mode 100644
index 00000000..16a9d810
--- /dev/null
+++ b/assets/languages/pl/assets/images/menus/mainmenu/story mode.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/languages/pl/assets/images/menus/storymenu/difficulties/easy.png b/assets/languages/pl/assets/images/menus/storymenu/difficulties/easy.png
new file mode 100644
index 00000000..2492db6b
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/difficulties/easy.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/difficulties/hard.png b/assets/languages/pl/assets/images/menus/storymenu/difficulties/hard.png
new file mode 100644
index 00000000..9cba3efc
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/difficulties/hard.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/difficulties/normal.png b/assets/languages/pl/assets/images/menus/storymenu/difficulties/normal.png
new file mode 100644
index 00000000..270111fa
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/difficulties/normal.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/tutorial.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/tutorial.png
new file mode 100644
index 00000000..ba73cee7
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/tutorial.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week1.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week1.png
new file mode 100644
index 00000000..0c7db1de
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week1.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week2.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week2.png
new file mode 100644
index 00000000..726ee825
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week2.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week3.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week3.png
new file mode 100644
index 00000000..33988dfd
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week3.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week4.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week4.png
new file mode 100644
index 00000000..3fd690e6
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week4.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week5.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week5.png
new file mode 100644
index 00000000..9ce92702
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week5.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week6.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week6.png
new file mode 100644
index 00000000..5f12895e
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week6.png differ
diff --git a/assets/languages/pl/assets/images/menus/storymenu/weeks/week7.png b/assets/languages/pl/assets/images/menus/storymenu/weeks/week7.png
new file mode 100644
index 00000000..7147d19d
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/storymenu/weeks/week7.png differ
diff --git a/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.png b/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.png
new file mode 100644
index 00000000..2bbccdbb
Binary files /dev/null and b/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.png differ
diff --git a/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.xml b/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.xml
new file mode 100644
index 00000000..6c2d7a55
--- /dev/null
+++ b/assets/languages/pl/assets/images/menus/titlescreen/titleEnter.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/languages/pl/config.ini b/assets/languages/pl/config.ini
index 9f7a55ee..24c29233 100644
--- a/assets/languages/pl/config.ini
+++ b/assets/languages/pl/config.ini
@@ -1,3 +1,3 @@
name="Polski"
-credits="GlitchDotSmh & Kolze"
+credits="GlitchDotSmh, Kolze & Verwex"
version="1.0.0"
\ No newline at end of file
diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx
index 129a4aeb..7e4d29bc 100644
--- a/source/funkin/backend/system/Flags.hx
+++ b/source/funkin/backend/system/Flags.hx
@@ -26,8 +26,8 @@ class Flags {
public static var MOD_DOWNLOAD_LINK:String = "";
public static var MOD_DEPENDENCIES:Array = [];
- @:noCompletion public static var MOD_ICON64:String = "";
@:noCompletion public static var MOD_ICON32:String = "";
+ @:noCompletion public static var MOD_ICON24:String = "";
@:noCompletion public static var MOD_ICON16:String = "";
public static var MOD_ICON:String = "";
@@ -46,6 +46,7 @@ class Flags {
public static var COMMIT_HASH:String = GitCommitMacro.commitHash;
public static var COMMIT_MESSAGE:String = 'Commit $COMMIT_NUMBER ($COMMIT_HASH)';
+ @:bypass public static var WINDOW_TITLE_USE_MOD_NAME:Bool = false;
@:lazy public static var TITLE:String = Application.current.meta.get('name');
@:lazy public static var VERSION:String = Application.current.meta.get('version');
@@ -283,6 +284,8 @@ class Flags {
else trace('Invalid section $name');
}
}
+
+ if (!flags.exists("WINDOW_TITLE_USE_MOD_NAME")) flags.set("WINDOW_TITLE_USE_MOD_NAME", flags.exists('TITLE') ? 'false' : 'true');
}
public static function loadFromDatas(datas:Array) {
diff --git a/source/funkin/backend/system/MainState.hx b/source/funkin/backend/system/MainState.hx
index a1ed11a6..3b78f47e 100644
--- a/source/funkin/backend/system/MainState.hx
+++ b/source/funkin/backend/system/MainState.hx
@@ -112,7 +112,7 @@ class MainState extends FlxState {
TranslationUtil.setLanguage(Flags.DISABLE_LANGUAGES ? Flags.DEFAULT_LANGUAGE : null);
ModsFolder.onModSwitch.dispatch(ModsFolder.currentModFolder); // Loads global.hx
MusicBeatTransition.script = Flags.DEFAULT_TRANSITION_SCRIPT;
- WindowUtils.resetTitle();
+ WindowUtils.resetAffixes(false);
WindowUtils.setWindow();
Main.refreshAssets();
DiscordUtil.init();
diff --git a/source/funkin/backend/utils/WindowUtils.hx b/source/funkin/backend/utils/WindowUtils.hx
index 82441459..05972822 100644
--- a/source/funkin/backend/utils/WindowUtils.hx
+++ b/source/funkin/backend/utils/WindowUtils.hx
@@ -45,16 +45,17 @@ final class WindowUtils {
* Resets the window title to the application name and resets the prefix and suffix.
**/
public static inline function resetTitle() {
- title = Flags.TITLE == null ? Lib.application.meta.get('name') : Flags.TITLE;
- resetAffixes();
+ resetAffixes(false);
+ title = Flags.TITLE;
}
/**
* Resets the prefix and suffix.
+ * @param update Should it update window title.
**/
- public static inline function resetAffixes() {
+ public static inline function resetAffixes(update = true) {
prefix = suffix = "";
- updateTitle();
+ if (update) updateTitle();
}
/**
@@ -62,11 +63,13 @@ final class WindowUtils {
* @param title The title to set.
* @param image The image to set as the icon.
**/
- public static inline function setWindow(?name:String, ?image:String)
+ public static inline function setWindow(?title:String, ?image:String)
{
- if (Flags.MOD_ICON == null && image == null) return;
- Lib.application.window.setIcon(lime.graphics.Image.fromBytes(Assets.getBytes(Paths.image(image != null ? image : Flags.MOD_ICON))));
- title = name != null ? name : Flags.MOD_NAME;
+ // TODO: Implement ICON SIZES in Flags.
+ WindowUtils.title = title != null ? title : (Flags.WINDOW_TITLE_USE_MOD_NAME ? Flags.MOD_NAME : Flags.TITLE);
+
+ var iconPath = image != null ? image : Flags.MOD_ICON;
+ if (Assets.exists(Paths.image(iconPath))) Lib.application.window.setIcon(lime.graphics.Image.fromBytes(Assets.getBytes(Paths.image(iconPath))));
}
/**
diff --git a/source/funkin/game/HealthIcon.hx b/source/funkin/game/HealthIcon.hx
index 935eefb1..5a02f3b5 100644
--- a/source/funkin/game/HealthIcon.hx
+++ b/source/funkin/game/HealthIcon.hx
@@ -388,7 +388,7 @@ class HealthIcon extends FunkinSprite
}) + sprTrackerOffset.x, sprTracker.y + sprTrackerOffset.y);
}
- if (animation.curAnim != null || (this.animated && animateAtlas != null)) {
+ if (animation.curAnim != null || this.animated) {
var data = getIconAnim(health);
var localAnimState = data.animState;