Add Metadata files to character folders, add lua dlls, add the song Slayer of. by Aden Mayo, add some missing translations

.gitignore

@@ -37,5 +37,6 @@
 /Test/System/0.JpnNijiiro
 /Test/System/BasicStyle
 /Test/System/OpenSkin
+/Test/Global/Characters/Don
 uniqueID.json
 *.score.ini

TJAPlayer3/Databases/DBCharacter.cs

@@ -19,6 +19,13 @@ namespace TJAPlayer3
 
         public class CharacterData
         {
+            public CharacterData()
+            {
+                Name = "(None)";
+                Rarity = "Common";
+                Author = "(None)";
+            }
+
             public CharacterData(string pcn, string pcr, string pca)
             {
                 Name = pcn;

TJAPlayer3/Databases/Databases.cs

@@ -7,20 +7,20 @@ namespace TJAPlayer3
     {
         public void tDatabases()
         {
-            DBPuchichara = new DBPuchichara();
+            //DBPuchichara = new DBPuchichara();
             DBUnlockables = new DBUnlockables();
-            DBCharacter = new DBCharacter();
+            //DBCharacter = new DBCharacter();
             DBCDN = new DBCDN();
 
-            DBPuchichara.tDBPuchichara();
+            //DBPuchichara.tDBPuchichara();
             DBUnlockables.tDBUnlockables();
-            DBCharacter.tDBCharacter();
+            //DBCharacter.tDBCharacter();
             DBCDN.tDBCDN();
         }
 
-        public DBPuchichara DBPuchichara;
+        //public DBPuchichara DBPuchichara;
         public DBUnlockables DBUnlockables;
-        public DBCharacter DBCharacter;
+        //public DBCharacter DBCharacter;
         public DBCDN DBCDN;
     }
 }

TJAPlayer3/Stages/01.StartUp/CCharacter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FDK;
+using System.IO;
+
+namespace TJAPlayer3
+{
+    class CCharacter
+    {
+        public DBCharacter.CharacterData metadata;
+        public DBUnlockables.CUnlockConditions unlock;
+        public string _path;
+
+        public CCharacter(string path)
+        {
+            _path = path;
+
+            // Character metadata
+            if (File.Exists($@"{path}\Metadata.json"))
+                metadata = ConfigManager.GetConfig<DBCharacter.CharacterData>($@"{path}\Metadata.json");
+            else
+                metadata = new DBCharacter.CharacterData();
+
+            // Character unlockables
+            if (File.Exists($@"{path}\Unlock.json"))
+                unlock = ConfigManager.GetConfig<DBUnlockables.CUnlockConditions>($@"{path}\Unlock.json");
+            else
+                unlock = null;
+        }
+    }
+}

TJAPlayer3/Stages/01.StartUp/TextureLoader.cs

@@ -700,9 +700,6 @@ namespace TJAPlayer3
             var puchicharaDirs = System.IO.Directory.GetDirectories(TJAPlayer3.strEXEのあるフォルダ + GLOBAL + PUCHICHARA);
             TJAPlayer3.Skin.Puchichara_Ptn = puchicharaDirs.Length;
 
-            // Legacy
-            //PuchiChara = new CTexture[TJAPlayer3.Skin.Puchichara_Ptn];
-
             Puchichara = new CPuchichara[TJAPlayer3.Skin.Puchichara_Ptn];
             TJAPlayer3.Skin.Puchicharas_Name = new string[TJAPlayer3.Skin.Puchichara_Ptn];
 
@@ -710,9 +707,6 @@ namespace TJAPlayer3
             {
                 Puchichara[i] = new CPuchichara(puchicharaDirs[i]);
 
-                //PuchiChara[i] = TxCAbsolute($@"{puchicharaDirs[i]}\Chara.png");
-                //PuchiChara[i].vc拡大縮小倍率 = new SharpDX.Vector3(TJAPlayer3.Skin.Game_PuchiChara_Scale[0]);
-
                 TJAPlayer3.Skin.Puchicharas_Name[i] = System.IO.Path.GetFileName(puchicharaDirs[i]);
             }
 
@@ -961,6 +955,7 @@ namespace TJAPlayer3
             TJAPlayer3.Skin.Characters_Ptn = charaDirs.Length;
 
             Characters_Heya_Preview = new CTexture[TJAPlayer3.Skin.Characters_Ptn];
+            Characters = new CCharacter[TJAPlayer3.Skin.Characters_Ptn];
 
             Characters_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][];
             Characters_Normal_Missed = new CTexture[TJAPlayer3.Skin.Characters_Ptn][];
@@ -1054,7 +1049,11 @@ namespace TJAPlayer3
                 this.ReloadCharacter(-1, TJAPlayer3.NamePlateConfig.data.Character[i], i, i == 0);
 
             for (int i = 0; i < TJAPlayer3.Skin.Characters_Ptn; i++)
+            {
                 Characters_Heya_Preview[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @"\Normal\0.png");
+                Characters[i] = new CCharacter(charaDirs[i]);
+            }
+                
 
             #endregion
 
@@ -1857,7 +1856,6 @@ namespace TJAPlayer3
         #endregion
         #region PuchiChara
 
-        //public CTexture[] PuchiChara;
         public CPuchichara[] Puchichara;
         
         #endregion
@@ -2017,6 +2015,7 @@ namespace TJAPlayer3
             Characters_Result_Normal;
 
         public CTexture[] Characters_Heya_Preview;
+        public CCharacter[] Characters;
 
         #endregion
 

TJAPlayer3/Stages/07.Game/CAct演奏Combo音声.cs

@@ -113,7 +113,7 @@ namespace TJAPlayer3
 
                     #region [Floor voices]
 
-                    currentDir = CSkin.Path(string.Format(@"Sounds\Tower_Combo\"));
+                    currentDir = ($@"{TJAPlayer3.strEXEのあるフォルダ}Global\Characters\{TJAPlayer3.Skin.Characters_DirName[_charaId]}\Sounds\Tower_Combo\");
                     if (Directory.Exists(currentDir))
                     {
                         foreach (var item in Directory.GetFiles(currentDir))

TJAPlayer3/Stages/11.Heya/CStageHeya.cs

@@ -140,19 +140,11 @@ namespace TJAPlayer3
             ttkCharacterAuthors = new TitleTextureKey[iCharacterCount];
             ttkCharacterNames = new TitleTextureKey[iCharacterCount];
 
-            var dbDataChara = TJAPlayer3.Databases.DBCharacter.data;
-
             for (int i = 0; i < iCharacterCount; i++)
             {
-                if (dbDataChara.ContainsKey(i))
-                {
-                    string rarity = dbDataChara[i].Rarity;
-
-                    var textColor = tRarityToColor(rarity);
-
-                    ttkCharacterNames[i] = new TitleTextureKey(dbDataChara[i].Name, this.pfHeyaFont, textColor, Color.Black, 1000);
-                    ttkCharacterAuthors[i] = new TitleTextureKey(dbDataChara[i].Author, this.pfHeyaFont, Color.White, Color.Black, 1000);
-                }
+                var textColor = tRarityToColor(TJAPlayer3.Tx.Characters[i].metadata.Rarity);
+                ttkCharacterNames[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.Name, this.pfHeyaFont, textColor, Color.Black, 1000);
+                ttkCharacterAuthors[i] = new TitleTextureKey(TJAPlayer3.Tx.Characters[i].metadata.Author, this.pfHeyaFont, Color.White, Color.Black, 1000);
             }
 
             #endregion
@@ -692,6 +684,7 @@ namespace TJAPlayer3
                 iDanTitleCurrent = _dans.Keys.ToList().IndexOf(_dan) + 1;
 
             iCharacterCurrent = Math.Max(0, Math.Min(TJAPlayer3.Skin.Characters_Ptn - 1, TJAPlayer3.NamePlateConfig.data.Character[this.iPlayer]));
+
             //iPuchiCharaCurrent = Math.Max(0, Math.Min(TJAPlayer3.Skin.Puchichara_Ptn - 1, TJAPlayer3.NamePlateConfig.data.PuchiChara[this.iPlayer]));
             iPuchiCharaCurrent = PuchiChara.tGetPuchiCharaIndexByName(this.iPlayer);
         }

TJAPlayer3/TJAPlayer3.csproj

@@ -147,9 +147,10 @@
     <Compile Include="I18N\CLang_jp.cs" />
     <Compile Include="I18N\CLang_zh.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Stages\01.StartUp\CCharacter.cs" />
     <Compile Include="Stages\01.StartUp\CPuchichara.cs" />
-    <Compile Include="Stages\07.Game\Taiko\ScriptBG.cs" />
     <Compile Include="Stages\07.Game\Taiko\NotesManager.cs" />
+    <Compile Include="Stages\07.Game\Taiko\ScriptBG.cs" />
     <Compile Include="Stages\XX.Templates\CStageTemplate.cs" />
     <EmbeddedResource Include="Properties\Discord.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -441,17 +442,13 @@ move /y "$(TargetDir)DirectShowLib-2005.dll" "$(SolutionDir)Test\dll\"
 
 move /y "$(TargetDir)SlimDX.dll" "$(SolutionDir)Test\dll\"
 
-
-move /y "$(TargetDir)KeraLua.dll" "$(SolutionDir)Test\dll\"
+move /y "$(TargetDir)NLua.dll" "$(SolutionDir)Test\dll\"
 
-
-move /y "$(TargetDir)liblua54.dylib" "$(SolutionDir)Test\dll\"
-
-
 move /y "$(TargetDir)lua54.dll" "$(SolutionDir)Test\dll\"
 
-
-move /y "$(TargetDir)NLua.dll" "$(SolutionDir)Test\dll\"
+move /y "$(TargetDir)KeraLua.dll" "$(SolutionDir)Test\dll\"
+
+move /y "$(TargetDir)liblua54.dylib" "$(SolutionDir)Test\dll\"
 
 move /y "$(TargetDir)CSharpTest.Net.Collections.*" "$(SolutionDir)Test\dll\"
 

Test/Documentation/I18N/DictionnaryIndexes.md

@@ -165,6 +165,14 @@
 10061 : "Konga clap key settings" description
 10062 : "Konga clap key settings for 2P" option title
 10063 : "Konga clap key settings for 2P" description
+10064 : "Decide key settings" option title
+10065 : "Decide key settings" description
+10066 : "Cancel key settings" option title
+10067 : "Cancel key settings" description
+10068 : "Left Change key settings" option title
+10069 : "Left Change key settings" description
+10070 : "Right Change key settings" option title
+10071 : "Right Change key settings" description
 10084 : "Shin-uchi toggle" option title
 10085 : "System options" menu title
 10086 : "Gameplay options" menu title

Test/Global/Characters/0/Metadata.json

@@ -0,0 +1,5 @@
+{
+	"name" : "None",
+    "rarity": "Common",
+	"author": "",
+}

Test/README.md

@@ -63,6 +63,7 @@ Summer Overload! : Akako Hinami - https://soundcloud.app.goo.gl/nnjSb (Chart by
 Halcyon : Akako Hinami - https://soundcloud.app.goo.gl/nnjSb (Chart by bol)
 Chasing the Wind : DashyDesu - https://www.youtube.com/c/DashyDesu (Chart by DashyDesu & bol)
 Back Where I'm From : NetroAki - https://soundcloud.com/netroaki | https://twitter.com/netroaki | https://instagram.com/netroaki | https://netroaki.audio/ (Chart by 0AuBSQ)
+Slayer of. : Aden Mayo - https://www.youtube.com/channel/UCXEd-dVZGZDf6plBmGd8cig (Chart by bol)
 ```
 
 ### About the OpenTaiko Original Soundtrack
@@ -107,6 +108,6 @@ Chinese : WHMHammer - https://github.com/WHMHammer
 Main developer : 0AuBSQ - https://github.com/0auBSQ/OpenTaiko
 Several bug fixes and improvements : l1m0n3 - https://github.com/l1m0n3
 Complete removal of the SlimDX dependency : Mr-Oiji https://github.com/Mr-Ojii
-Several skinning extensions and improvements : Takkkom - https://github.com/Takkkom
+Several features and major improvements : Takkkom - https://github.com/Takkkom
 Mod icons : FAKEYJSNPI - https://github.com/FAKEYJSNPI 
 ```

Test/Songs/08 OpenTaiko Original/Slayer of/Slayer of..tja

@@ -0,0 +1,709 @@
+TITLE:Slayer of.
+SUBTITLE:--Aden Mayo
+BPM:230
+WAVE:Slayer of..ogg
+OFFSET:-0.043
+DEMOSTART:60.564
+SCOREMODE:2
+
+COURSE:Edit
+LEVEL:10
+BALLOON:
+SCOREINIT:690
+SCOREDIFF:0
+
+#START
+#SCROLL 0.75
+30201201,
+20120121,
+10201201,
+#GOGOSTART
+#SCROLL 1
+3021203022104012,
+#GOGOEND
+#SCROLL 0.75
+10201201,
+20120121,
+10201201,
+#GOGOSTART
+#SCROLL 1
+3022103020112210,
+
+1011201110102010,
+1110201210112010,
+1011201110102010,
+1011201122102212,
+1011201110102010,
+1110201210112010,
+1011201110102010,
+1011201011102222,
+
+1011101020222020,
+2021212020112210,
+1021212020112110,
+1011201022112210,
+1011101020222020,
+2021212020112210,
+1021212020112110,
+1011201040102222,
+
+#SCROLL 1.25
+1010221010112010,
+100000100100200100100000200200100100202020202020,
+#GOGOEND
+
+#SCROLL 1
+10201212,
+100000200111100200100200,
+10201212,
+100000220000100200100200,
+10201212,
+100000200111100200100200,
+1120221012202112,
+2011201121102210,
+
+10201212,
+100000200111100200100200,
+10201212,
+100000100000202000100000101000200000100200200000,
+10201212,
+100000200111100200100200,
+1011201022002210,
+2210101120112011,
+
+1000201110201120,
+100000000000200000101010100000200000100000200200,
+1000222011101220,
+1120221011202210,
+1000201110201120,
+100000000000200000101010100000200000100000200200,
+1000222210002211,
+1000211110002210,
+
+1000201110201120,
+101020102000100000000000100100100000200100200000,
+2220111012102120,
+1120112022102210,
+1000201110201120,
+100000000000200000101010100000200000100000200200,
+50000008,
+400000101000400000101000400000101000400000100100,
+
+#GOGOSTART
+1011202010112020,
+1011201122102210,
+1110222011101220,
+1011201122121012,
+1011202010112020,
+1110221012102120,
+1011202210112022,
+1011202211102210,
+
+1011201210212022,
+101020102000100000000000100100100000200100200200,
+1210221012102210,
+1110221011201220,
+1011201211102220,
+1011201212102120,
+1111201111201120,
+1111201111201120,
+
+#SCROLL 0.75
+100000000000000000100000202020100100202020100000,
+1000201122102110,
+101010200100200000100000200000200200100000200000,
+300000000000300000000000200200101010200000000000,
+#SCROLL 1
+1120112012201120,
+2210221021102110,
+2211201021112010,
+2211221111221110,
+
+100000100100200000100000200010002000100020001000,
+100100100000200020002000100100100000200200200000,
+200010001000200010001000200200100000200100100000,
+1011222210112120,
+1011201022102120,
+1011201021102220,
+2221221121112111,
+1122112212221222,
+
+1011202010112020,
+1011201122102210,
+1110222011101220,
+1011201122121012,
+1011202010112020,
+1110221012102120,
+1110222012102120,
+1121221011212220,
+
+1011201210212022,
+101020102000100000000000100100100000200100200000,
+1210221012102210,
+1110221011201220,
+1011201211102220,
+1011201212102120,
+2212212212212211,
+2112112112112212,
+#GOGOEND
+
+,
+#END
+
+COURSE:Oni
+LEVEL:10
+BALLOON:
+SCOREINIT:840
+SCOREDIFF:0
+
+#START
+#SCROLL 0.75
+30201201,
+20120121,
+10201201,
+#SCROLL 1.1
+#GOGOSTART
+3011103000104010,
+#SCROLL 0.75
+#GOGOEND
+10201201,
+20120121,
+10201201,
+#SCROLL 1.1
+#GOGOSTART
+3011103022204020,
+
+10201120,
+1011202010002011,
+1011202010112020,
+1011202010002000,
+10201120,
+1011202010002011,
+1011202020101110,
+1021201010002210,
+
+10201120,
+1011202010002011,
+1011202010112020,
+1011202010002000,
+10201120,
+1011202010002011,
+1011202020101110,
+2220111040004000,
+
+#SCROLL 1.25
+1110201020102220,
+4010401040101110,
+#GOGOEND
+
+#SCROLL 1.1
+1000200011201020,
+1000201110201020,
+1000200011201020,
+1000200011201120,
+1000200011201020,
+1000201110201020,
+1120102012101020,
+2010211010221020,
+
+1000200011201020,
+1000201110201020,
+1000200011201020,
+1110201110201120,
+1000200011201020,
+1000201110201020,
+1010112010101121,
+200100100110400100400100,
+
+1000200011201120,
+1000201110201120,
+1000201110201120,
+1110201011102020,
+1000222011201120,
+1010201120201120,
+1111200011122000,
+1122200022112000,
+
+5008,
+1121200011102020,
+2220111021202220,
+1110201120102210,
+1000222011201120,
+1000201120201120,
+50000008,
+41414140,
+
+#GOGOSTART
+1000200011201120,
+1000201110201120,
+1000201110201120,
+1110201011102020,
+1000222011201120,
+1010201120201120,
+1111200011122000,
+1122200022112000,
+
+5008,
+1121200011102020,
+2220111021202220,
+1110201120102210,
+1000222011201120,
+1000201120201120,
+50000008,
+1000201110404040,
+
+#SCROLL 0.75
+1000211121112111,
+2000201120002020,
+1010201040104011,
+2000300040112000,
+#SCROLL 1.1
+1121201010201020,
+2110201210202020,
+11211212,
+2111211121212120,
+
+1212121112122121,
+2112222211111122,
+1121202011202020,
+21121122,
+1211122111202000,
+1120201110102010,
+1120201010102010,
+21212121,
+
+1000200011201120,
+1000201110201120,
+1000201110201120,
+1110201011102020,
+1000222011201120,
+1010201120201120,
+1110202011102020,
+1210202022102020,
+
+5008,
+1121200011102020,
+2220111021202220,
+1110201120102210,
+1000222011201120,
+1000201120201120,
+1121221211211121,
+2121121112211212,
+#GOGOEND
+
+,
+#END
+
+COURSE:Hard
+LEVEL:8
+BALLOON:
+SCOREINIT:1100
+SCOREDIFF:0
+
+#START
+#SCROLL 0.75
+30201201,
+20120120,
+10201201,
+#GOGOSTART
+#SCROLL 1
+30030040,
+#GOGOEND
+#SCROLL 0.75
+10201201,
+20120120,
+10201201,
+#GOGOSTART
+#SCROLL 1
+30032222,
+
+10201120,
+1010201110002000,
+11211022,
+11210120,
+10201120,
+1010201110002000,
+11211022,
+11210122,
+
+10201120,
+1010201110002000,
+11211022,
+11210120,
+10201120,
+1010201110002000,
+11211022,
+11404040,
+
+1000201000102220,
+40404068,
+#GOGOEND
+
+10201212,
+1000201110201020,
+10201212,
+10201212,
+10201212,
+1000201110201020,
+1110202011102020,
+1110111010101000,
+
+10201212,
+1000201110201020,
+10201212,
+10401212,
+10201212,
+1000201110201020,
+1110202011102220,
+41114140,
+
+10201212,
+1000201110201020,
+10201212,
+10221120,
+10201212,
+1000201110201020,
+1110200011102000,
+1110200011102000,
+
+5008,
+1122200020002000,
+2112,
+1000202220002220,
+1000201110201020,
+1000201110201022,
+50000008,
+4444,
+
+#GOGOSTART
+10201212,
+1000201110201020,
+10201212,
+10221120,
+10201212,
+1000201110201020,
+1110200011102000,
+1110200011102000,
+
+5008,
+1122201110002000,
+2112,
+1110200022202000,
+10211212,
+1000201110201020,
+10211212,
+10211444,
+
+#SCROLL 0.75
+10112011,
+02102012,
+10112120,
+3000300040112000,
+#SCROLL 1
+1110201010201020,
+1110201010202020,
+1110201010201020,
+1110201020202000,
+
+1110202011102020,
+1110201120102000,
+1110202011102020,
+21121122,
+1110201010102000,
+1110201010102000,
+1110201010102010,
+21212120,
+
+10201212,
+1000201110201020,
+10201212,
+10221120,
+10201212,
+1000201110201020,
+1110202011102020,
+1110222011102220,
+
+5008,
+1122201110102020,
+2011100010112000,
+1110200022202000,
+10211212,
+1000201110201020,
+10211212,
+1110111022202222,
+#GOGOEND
+
+,
+#END
+
+COURSE:Normal
+LEVEL:7
+BALLOON:3,3,3,3,3
+SCOREINIT:1540
+SCOREDIFF:0
+
+#START
+30200200,
+20020120,
+10200200,
+#GOGOSTART
+30030040,
+#GOGOEND
+10200200,
+20020120,
+10200200,
+#GOGOSTART
+30035008,
+
+1212,
+10211020,
+10211020,
+10210120,
+1212,
+10211020,
+10211020,
+10210120,
+
+1212,
+10211020,
+10211020,
+10210120,
+1212,
+10211020,
+10211020,
+1444,
+
+10010011,
+4444,
+#GOGOEND
+
+10201202,
+10211202,
+10201202,
+10201202,
+10201202,
+10211202,
+11201120,
+11101110,
+
+10201202,
+10211202,
+10201202,
+10201202,
+10201202,
+10211202,
+11201120,
+4144,
+
+10201202,
+10211202,
+10201202,
+10201202,
+10201202,
+10211202,
+11201120,
+11201120,
+
+5008,
+7822,
+2112,
+10122020,
+10201212,
+10201212,
+5008,
+4444,
+
+#GOGOSTART
+10201202,
+10211202,
+10201202,
+10201202,
+10201202,
+10211202,
+11201120,
+11201120,
+
+5008,
+7822,
+2112,
+10122020,
+10201212,
+10201212,
+5008,
+10101110,
+
+10002100,
+10012000,
+10102022,
+3344,
+11201120,
+11201120,
+11201120,
+11201120,
+
+11101120,
+12102120,
+11201120,
+20120120,
+11211120,
+11211120,
+11211121,
+10210120,
+
+10201202,
+10211202,
+10201202,
+10201202,
+10201202,
+10211202,
+11201120,
+11201120,
+
+5008,
+7822,
+2112,
+10122020,
+10201212,
+10201212,
+11201120,
+11102222,
+#GOGOEND
+
+,
+#END
+
+COURSE:Easy
+LEVEL:4
+BALLOON:
+SCOREINIT:2600
+SCOREDIFF:0
+
+#START
+3,
+,
+,
+#GOGOSTART
+30030030,
+#GOGOEND
+3,
+,
+,
+#GOGOSTART
+30030000,
+
+1202,
+1202,
+1202,
+1212,
+1202,
+1202,
+1202,
+1212,
+
+1202,
+1202,
+1202,
+1212,
+1202,
+1202,
+1202,
+1444,
+
+10010010,
+4444,
+#GOGOEND
+
+10200202,
+00200202,
+00200202,
+00200202,
+10200202,
+00200202,
+11,
+1110,
+
+10200202,
+00200202,
+00200202,
+00200202,
+10200202,
+00200202,
+11,
+4044,
+
+5008,
+1122,
+1212,
+1122,
+5008,
+1122,
+33,
+44,
+
+5008,
+2222,
+2112,
+1122,
+5,
+8,
+5008,
+4444,
+
+#GOGOSTART
+5008,
+1122,
+1212,
+1122,
+5008,
+1122,
+33,
+44,
+
+5008,
+2222,
+2112,
+1122,
+5,
+8,
+5008,
+1111,
+
+12,
+12,
+1022,
+3358,
+1212,
+1212,
+1212,
+1212,
+
+1112,
+1122,
+1212,
+2222,
+1212,
+1212,
+1212,
+1212,
+
+5008,
+1122,
+1212,
+1122,
+5008,
+1122,
+3232,
+3232,
+
+5008,
+2222,
+2112,
+1122,
+5,
+8,
+5008,
+10101011,
+#GOGOEND
+
+,
+#END