trying assets change and index merge

example_mods/french-language/_append/locales/index.xml

@@ -4,6 +4,6 @@
 		<contributors value="MidyGamy"/>
 		<ui language="Langue" region="Region" accept="Ok" />
 		<label id="fr-FR" language="Francais" region="France"/>
-		<label id="en-US,en-GB,en-CA" language="Anglais" region="Etats Unis"/>
+		<label id="en-US,en-GB,en-CA" language="French" region="France"/>
 	</locale>
 </data>

example_mods/french-language/_merge/locales/index.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <data>
 	<locale id="en-US">
-		<label id="fr-FR" language="French" region="France">
-			<merge key="id" value="fr-FR"/>
-		</label>
+		<merge/>
+		<label id="fr-FR" language="Anglais" region="Etats Unis"/>
+		<label id="en-US" language="English" region="United States"/>
 	</locale>
 </data>

example_mods/french-language/_polymod_meta.json

@@ -1,5 +1,5 @@
 {
-  "title": "Intro Mod",
+  "title": "French Localization Mod",
   "description": "A localization testing mod",
   "contributors": [
     {

example_mods/french-language/locales/fr-FR/assets/data/dialogue/conversations/roses-censored.json

@@ -0,0 +1,59 @@
+{
+  "version": "1.0.0",
+
+  "backdrop": {
+    "type": "solid",
+    "fadeTime": 2.0,
+    "color": "#BFB3DFD8"
+  },
+
+  "music": {
+    "asset": "Lunchbox",
+    "fadeTime": 2.0,
+    "looped": true
+  },
+
+  "outro": {
+    "type": "fade",
+    "fadeTime": 1.0
+  },
+
+  "dialogue": [
+    {
+      "speaker": "senpai-angry",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "angrySenpai",
+
+      "text": ["Pas mauvais pour un ver de terre."]
+    },
+    {
+      "speaker": "senpai-angry",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "idle",
+
+      "text": ["Mais cette fois je vais te faire crier..."],
+      "speed": 0.5
+    },
+    {
+      "speaker": "senpai-angry",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "idle",
+
+      "text": [
+        "Presque autant que ta petite amie que je ferai crier plus tard ce soir, gros nain."
+      ],
+      "speed": 0.5
+    },
+    {
+      "speaker": "bf-pixel",
+      "speakerAnimation": "talkEnter",
+      "box": "roses",
+      "boxAnimation": "idle",
+
+      "text": ["Bop beep be be skdoo bep"]
+    }
+  ]
+}

example_mods/french-language/locales/fr-FR/assets/data/dialogue/conversations/roses.json

@@ -0,0 +1,49 @@
+{
+  "version": "1.0.0",
+
+  "backdrop": {
+    "type": "solid",
+    "fadeTime": 2.0,
+    "color": "#BFB3DFD8"
+  },
+
+  "music": {
+    "asset": "Lunchbox",
+    "fadeTime": 2.0,
+    "looped": true
+  },
+
+  "outro": {
+    "type": "fade",
+    "fadeTime": 1.0
+  },
+
+  "dialogue": [
+    {
+      "speaker": "senpai-angry",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "angrySenpai",
+
+      "text": ["Pas mauvais pour un ver de terre."]
+    },
+    {
+      "speaker": "senpai-angry",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "idle",
+
+      "text": [
+        "Mais cette fois, je t'arracherai les noix juste après que ta copine aura fini de jouer avec les miennes."
+      ]
+    },
+    {
+      "speaker": "bf-pixel",
+      "speakerAnimation": "talkEnter",
+      "box": "roses",
+      "boxAnimation": "idle",
+
+      "text": ["Bop beep be be skdoo bep"]
+    }
+  ]
+}

example_mods/french-language/locales/fr-FR/assets/data/dialogue/conversations/senpai.json

@@ -0,0 +1,51 @@
+{
+  "version": "1.0.0",
+
+  "backdrop": {
+    "type": "solid",
+    "fadeTime": 2.0,
+    "color": "#BFB3DFD8"
+  },
+
+  "music": {
+    "asset": "Lunchbox",
+    "fadeTime": 2.0,
+    "looped": true
+  },
+
+  "outro": {
+    "type": "fade",
+    "fadeTime": 1.0
+  },
+
+  "dialogue": [
+    {
+      "speaker": "senpai",
+      "speakerAnimation": "talkEnter",
+      "box": "roses",
+      "boxAnimation": "enter",
+
+      "text": [
+        "Ah, une nouvelle belle et jeune fille est venue en quête du véritable amour !"
+      ]
+    },
+    {
+      "speaker": "senpai",
+      "speakerAnimation": "talk",
+      "box": "roses",
+      "boxAnimation": "speaking",
+
+      "text": [
+        "Une sérénade entre gentlemen décidera de qui son beau cœur appartiendra."
+      ]
+    },
+    {
+      "speaker": "bf-pixel",
+      "speakerAnimation": "talkEnter",
+      "box": "roses",
+      "boxAnimation": "speaking",
+
+      "text": ["Beep bo bop"]
+    }
+  ]
+}

example_mods/french-language/locales/fr-FR/assets/data/dialogue/conversations/thorns.json

@@ -0,0 +1,64 @@
+{
+  "version": "1.0.0",
+
+  "backdrop": {
+    "type": "solid",
+    "fadeTime": 2.0,
+    "color": "#BFB3DFD8"
+  },
+
+  "music": {
+    "asset": "LunchboxScary",
+    "fadeTime": 2.0,
+    "looped": true
+  },
+
+  "outro": {
+    "type": "fade",
+    "fadeTime": 1.0
+  },
+
+  "dialogue": [
+    {
+      "speaker": "spirit",
+      "speakerAnimation": "talk",
+      "box": "thorns",
+      "boxAnimation": "enter",
+
+      "text": [
+        "Contact direct avec de vrais humains, après avoir été enfermé ici pendant si longtemps...",
+        " et avec ELLE parmis tant de monde."
+      ],
+      "speed": 1.0
+    },
+    {
+      "speaker": "spirit",
+      "speakerAnimation": "talk",
+      "box": "thorns",
+      "boxAnimation": "idle",
+
+      "text": [
+        "Je ferai payer à son père ce qu'il m'a fait, à moi et à tous les autres..."
+      ]
+    },
+    {
+      "speaker": "spirit",
+      "speakerAnimation": "talk",
+      "box": "thorns",
+      "boxAnimation": "idle",
+
+      "text": ["Je te battrai et tu prendras ma place."]
+    },
+    {
+      "speaker": "spirit",
+      "speakerAnimation": "talk",
+      "box": "thorns",
+      "boxAnimation": "idle",
+
+      "text": [
+        "Cela ne vous dérange pas que vos corps soient empruntés, n'est-ce pas ?",
+        " C'est ce qu'il y a de plus juste..."
+      ]
+    }
+  ]
+}

example_mods/french-language/locales/fr-FR/assets/data/introText.txt

@@ -0,0 +1,61 @@
+shoutouts to tom fulp--lmao
+Ludum dare--extraordinaire
+cyberzone--coming soon
+love to thriftman--swag
+ultimate rhythm gaming--probably
+dope ass game--playstation magazine
+in loving memory of--henryeyes
+dancin--forever
+funkin--forever
+ritz dx--rest in peace lol
+rate five--pls no blam
+rhythm gaming--ultimate
+game of the year--forever
+you already know--we really out here
+rise and grind--love to luis
+like parappa--but cooler
+album of the year--chuckie finster
+free gitaroo man--with love to wandaboy
+better than geometry dash--fight me robtop
+kiddbrute for president--vote now
+play dead estate--on newgrounds
+this is a god damn prototype--we workin on it okay
+women are real--this is official
+too over exposed--newgrounds cant handle us
+Hatsune Miku--biggest inspiration
+too many people--my head hurts
+newgrounds--forever
+refined taste in music--if i say so myself
+his name isnt keith--dumb eggy lol
+his name isnt evan--silly tiktok
+stream chuckie finster--on spotify
+never forget to--pray to god
+dont play rust--we only funkin
+good bye--my penis
+dababy--biggest inspiration
+fashionably late--but here it is
+yooooooooooo--yooooooooo
+pico funny--pico funny
+updates each friday--on time every time
+shoutouts to mason--for da homies
+bonk--get in the discord call
+carpal tunnel--game design
+downscroll--i dont know what that is
+warning--choking hazard
+devin chat--what an honorable man
+kickstarter exclusive--intro text
+cussing--we have it
+parental advisory--explicit content
+pico says--trans rights
+album of the year--damage control
+proudly made--via newgrounds pms
+nicotine induced--game development
+free crackheads--with love to figburn
+press square--to open your popit menu
+jojo sez--shoooooooom
+updates each pico day--on time every time
+macromedia software--legally obtained
+under judgement--proud resident
+make tom proud--weekly second
+to enable pen pressure--disable windows ink
+trending--only on x

example_mods/french-language/locales/fr-FR/assets/images/storymenu/difficulties/nightmare.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TextureAtlas imagePath="nightmare.png" width="503" height="440">
+  <SubTexture name="idle0001" x="342" y="8" width="69" height="303" rotated="true" frameX="-12" frameY="-5" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0002" x="8" y="182" width="305" height="76" frameX="-13" frameY="-0" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0003" x="8" y="274" width="305" height="73" frameX="-13" frameY="-0" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0004" x="8" y="363" width="303" height="69" frameX="-9" frameY="-5" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0005" x="8" y="8" width="318" height="73" frameX="-0" frameY="-5" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0006" x="8" y="97" width="315" height="69" frameX="-0" frameY="-5" frameWidth="318" frameHeight="78" />
+  <SubTexture name="idle0007" x="427" y="8" width="68" height="302" rotated="true" frameX="-16" frameY="-4" frameWidth="318" frameHeight="78" />
+</TextureAtlas>

source/funkin/modding/PolymodHandler.hx

@@ -335,8 +335,19 @@ class PolymodHandler
   {
     return {
       assetLibraryPaths: [
-        'default' => 'preload', 'shared' => 'shared', 'songs' => 'songs', 'videos' => 'videos', 'tutorial' => 'tutorial', 'week1' => 'week1',
-        'week2' => 'week2', 'week3' => 'week3', 'week4' => 'week4', 'week5' => 'week5', 'week6' => 'week6', 'week7' => 'week7', 'weekend1' => 'weekend1',
+        'default' => 'preload',
+        'shared' => 'shared',
+        'songs' => 'songs',
+        'videos' => 'videos',
+        'tutorial' => 'tutorial',
+        'week1' => 'week1',
+        'week2' => 'week2',
+        'week3' => 'week3',
+        'week4' => 'week4',
+        'week5' => 'week5',
+        'week6' => 'week6',
+        'week7' => 'week7',
+        'weekend1' => 'weekend1',
       ],
       coreAssetRedirect: CORE_FOLDER,
     }
@@ -431,5 +442,6 @@ class PolymodHandler
     CharacterDataParser.loadCharacterCache(); // TODO: Migrate characters to BaseRegistry.
     NoteKindManager.loadScripts();
     ModuleHandler.loadModuleCache();
+    Localization.init();
   }
 }

source/funkin/ui/story/StoryMenuState.hx

@@ -313,7 +313,7 @@ class StoryMenuState extends MusicBeatState
 
     highScoreLerp = Std.int(MathUtil.smoothLerp(highScoreLerp, highScore, elapsed, 0.25));
 
-    scoreText.text = Localization.tongue.get("$LEVEL_SCORE", "menus") + ' ${Math.round(highScoreLerp)}';
+    scoreText.text = Localization.tongue.get("$LEVEL_SCORE", "story_menu") + ' ${Math.round(highScoreLerp)}';
 
     levelTitleText.text = currentLevel.getTitle();
     levelTitleText.x = FlxG.width - (levelTitleText.width + 10); // Right align.