diff --git a/Assembly-CSharp/Antlr3/BitSet.cs b/Assembly-CSharp/Antlr3/BitSet.cs index 8384402b6..a8eed2f0a 100644 --- a/Assembly-CSharp/Antlr3/BitSet.cs +++ b/Assembly-CSharp/Antlr3/BitSet.cs @@ -71,7 +71,6 @@ public BitSet() } /** Construction from a static array of longs */ - [CLSCompliant( false )] public BitSet( ulong[] bits ) { _bits = bits; diff --git a/Assembly-CSharp/Antlr3/BufferedTokenStream.cs b/Assembly-CSharp/Antlr3/BufferedTokenStream.cs index b915d1ab0..edaebad89 100644 --- a/Assembly-CSharp/Antlr3/BufferedTokenStream.cs +++ b/Assembly-CSharp/Antlr3/BufferedTokenStream.cs @@ -61,7 +61,6 @@ public class BufferedTokenStream : ITokenStream, ITokenStreamInformation * as its moving window moves through the input. This list captures * everything so we can access complete input text. */ - [CLSCompliant(false)] protected List _tokens = new List(100); /** Track the last mark() call result value for use in rewind(). */ @@ -72,7 +71,6 @@ public class BufferedTokenStream : ITokenStream, ITokenStreamInformation * to initialize with first token. The ctor doesn't get a token. * First call to LT(1) or whatever gets the first token and sets p=0; */ - [CLSCompliant(false)] protected int _p = -1; public BufferedTokenStream() diff --git a/Assembly-CSharp/Antlr3/RecognizerSharedState.cs b/Assembly-CSharp/Antlr3/RecognizerSharedState.cs index 33db85425..3d4729422 100644 --- a/Assembly-CSharp/Antlr3/RecognizerSharedState.cs +++ b/Assembly-CSharp/Antlr3/RecognizerSharedState.cs @@ -57,7 +57,6 @@ public class RecognizerSharedState */ //public List following; public BitSet[] following; - [CLSCompliant( false )] public int _fsp; /** diff --git a/Assembly-CSharp/Antlr3/UnbufferedTokenStream.cs b/Assembly-CSharp/Antlr3/UnbufferedTokenStream.cs index c1bfcb28b..6309f4857 100644 --- a/Assembly-CSharp/Antlr3/UnbufferedTokenStream.cs +++ b/Assembly-CSharp/Antlr3/UnbufferedTokenStream.cs @@ -54,7 +54,6 @@ namespace Antlr.Runtime */ public class UnbufferedTokenStream : LookaheadStream, ITokenStream, ITokenStreamInformation { - [CLSCompliant(false)] protected ITokenSource tokenSource; protected int tokenIndex; // simple counter to set token index in tokens diff --git a/Assembly-CSharp/Assembly-CSharp.csproj b/Assembly-CSharp/Assembly-CSharp.csproj index ea2cf667c..e2fa85001 100644 --- a/Assembly-CSharp/Assembly-CSharp.csproj +++ b/Assembly-CSharp/Assembly-CSharp.csproj @@ -12,7 +12,8 @@ Assembly-CSharp v3.5 512 - Client + + $(SolutionDir)\References\ latest diff --git a/Assembly-CSharp/Global/BGSCENE_DEF.cs b/Assembly-CSharp/Global/BGSCENE_DEF.cs index 86de175c0..e9795ab31 100644 --- a/Assembly-CSharp/Global/BGSCENE_DEF.cs +++ b/Assembly-CSharp/Global/BGSCENE_DEF.cs @@ -450,7 +450,7 @@ public void ExportMemoriaBGX(String bgxExportPath) { Color firstPixel = this.atlas.GetPixel(0, 0); } - catch (Exception err) + catch (Exception) { atlasIsReadable = false; } diff --git a/Assembly-CSharp/Global/Field/Map/FieldMap.cs b/Assembly-CSharp/Global/Field/Map/FieldMap.cs index 04a6deccb..1059b4de6 100644 --- a/Assembly-CSharp/Global/Field/Map/FieldMap.cs +++ b/Assembly-CSharp/Global/Field/Map/FieldMap.cs @@ -732,6 +732,23 @@ public void CenterCameraOnPlayer() break; } } + if (Configuration.Graphics.ScreenIs16to10()) + { + switch (map) // offsets for scrolling maps stretched to WS + { + case 456: // Dali Mountain/Summit + localPosition.x = 160 + 35; + break; + case 505: // Cargo ship offset + localPosition.x = 105 - 35; + break; + case 1153: // Rose Rouge cockpit offset + localPosition.x = 175 - 35; + break; + default: + break; + } + } } camera.transform.localPosition = localPosition; @@ -743,6 +760,7 @@ public void CenterCameraOnPlayer() //{mapNo,pixels on each side to crop because of scrollable} {1051,8}, {1057,16}, + {1058,16}, {1060,16}, {1652,16}, {1653,16}, @@ -980,13 +998,6 @@ public void ff9fieldInternalBattleEncountStart() FieldMap.FF9FieldAttr.field[0, 2] = 6425; } - private void PSVSet(ref ff9.SVECTOR vRot, Int16 thetaX, Int32 b, Int16 thetaZ) - { - vRot.vx = thetaX; - vRot.vy = (Int16)b; - vRot.vz = thetaZ; - } - private void EBG_init() { this.EBG_stateInit(); @@ -1599,10 +1610,6 @@ private void UpdateOverlay(Int32 ovrNdx, BGOVERLAY_DEF overlayPtr, Vector2 realV overlayPtr.scrY = num2; } - public void UpdateSortingOrder(BGOVERLAY_DEF overlayPtr, BGSPRITE_LOC_DEF sprite, Int32 i) - { - } - public void EBG_scene2DScroll(Int16 destX, Int16 destY, UInt16 frameCount, UInt32 scrollType) { if (!IsActive) diff --git a/Assembly-CSharp/Global/Field/Map/NarrowMapList.cs b/Assembly-CSharp/Global/Field/Map/NarrowMapList.cs index 4bb4a8343..7a1a6c04f 100644 --- a/Assembly-CSharp/Global/Field/Map/NarrowMapList.cs +++ b/Assembly-CSharp/Global/Field/Map/NarrowMapList.cs @@ -1,10 +1,23 @@ using System; using System.Collections.Generic; - +using System.Linq; +using Memoria; public static class NarrowMapList { public static Boolean IsCurrentMapNarrow() => IsNarrowMap(FF9StateSystem.Common.FF9.fldMapNo, PersistenSingleton.Instance?.fieldmap?.camIdx ?? -1); - public static Boolean IsNarrowMap(Int32 mapId, Int32 camId) => ListFullNarrow.Contains(mapId) || (ListPartialNarrow.TryGetValue(mapId, out HashSet narrowCams) && narrowCams.Contains(camId)); + public static Boolean IsNarrowMap(Int32 mapId, Int32 camId) + { + if (_ScreenIs16to10 && ListWideWhen16to10.Contains(mapId)) + return false; + if (ListFullNarrow.Contains(mapId)) + return true; + + if (ListPartialNarrow.TryGetValue(mapId, out HashSet narrowCams) && narrowCams.Contains(camId)) + return true; + return false; + } + + private static readonly Boolean _ScreenIs16to10 = Configuration.Graphics.ScreenIs16to10(); private static readonly Dictionary> ListPartialNarrow = new Dictionary>() { @@ -419,4 +432,136 @@ public static class NarrowMapList 3058, // Mage Village/Water Mil 3100, }; + + private static readonly HashSet ListWideWhen16to10 = new HashSet() + { + 55, + 60, + 102, + 109, + 150, + 157, + 161, + 162, + 201, + 206, + 207, + 251, + 252, + 262, + 405, + 407, + 456, + 505, + 553, + 556, + 561, + 565, + 566, + 568, + 569, + 571, + 613, + 656, + 657, + 658, + 659, + 663, + 705, + 751, + 753, + 755, + 806, + 813, + 851, + 855, + 901, + 911, + 913, + 950, + 1017, + 1018, + 1054, + 1058, + 1104, + 1108, + 1153, + 1201, + 1205, + 1210, + 1213, + 1218, + 1222, + 1251, + 1254, + 1303, + 1312, + 1313, + 1363, + 1403, + 1404, + 1408, + 1414, + 1424, + 1452, + 1453, + 1456, + 1509, + 1600, + 1601, + 1602, + 1656, + 1700, + 1701, + 1702, + 1803, + 1810, + 1814, + 1817, + 1820, + 1852, + 1858, + 1901, + 1911, + 1913, + 1953, + 2002, + 2004, + 2006, + 2052, + 2103, + 2112, + 2113, + 2163, + 2200, + 2212, + 2213, + 2222, + 2352, + 2353, + 2355, + 2400, + 2406, + 2451, + 2502, + 2503, + 2551, + 2601, + 2650, + 2657, + 2658, + 2706, + 2851, + 2855, + 2856, + 2904, + 2906, + 2913, + 2915, + 2928, + 3005, + 3052, + 3055, + 3100, + }; } diff --git a/Assembly-CSharp/Global/Hono/Behavior/HonoBehaviorSystem.cs b/Assembly-CSharp/Global/Hono/Behavior/HonoBehaviorSystem.cs index 1fb829b8e..fafc6c6ef 100644 --- a/Assembly-CSharp/Global/Hono/Behavior/HonoBehaviorSystem.cs +++ b/Assembly-CSharp/Global/Hono/Behavior/HonoBehaviorSystem.cs @@ -208,8 +208,9 @@ private void Update() private void LateUpdate() { - // Dummied: the FPSManager always handles the regularity of the main loop return; + /* //Dummied: the FPSManager always handles the regularity of the main loop + if (!HonoBehaviorSystem.FrameSkipEnabled) return; Single deltaTime = Time.deltaTime; @@ -227,7 +228,7 @@ private void LateUpdate() { HonoBehaviorSystem._cumulativeTime -= HonoBehaviorSystem.TargetFrameTime * (Single)num; HonoBehaviorSystem.ExtraLoopCount = num - 1; - } + }*/ } private void OnGUI() diff --git a/Assembly-CSharp/Global/SFXRender/SFXRender.cs b/Assembly-CSharp/Global/SFXRender/SFXRender.cs index a94ca9286..bf79d7e06 100644 --- a/Assembly-CSharp/Global/SFXRender/SFXRender.cs +++ b/Assembly-CSharp/Global/SFXRender/SFXRender.cs @@ -146,7 +146,7 @@ public static void SaveSFXDataMeshes() foreach (Int32 sfxFrameNum in data.frameMesh.Keys) if (lastFrame < sfxFrameNum) lastFrame = sfxFrameNum; - if (false) // last 2 saves: from camera above with units far away (y) and bone positions artificially splitted (x), find where pieces are placed wrt. caster and target + /*if (false) // last 2 saves: from camera above with units far away (y) and bone positions artificially splitted (x), find where pieces are placed wrt. caster and target { data.SwitchToWorldCoordinates(); foreach (SFXDataMeshConverter.Frame sfxFrame in data.frameMesh.Values) @@ -179,7 +179,7 @@ public static void SaveSFXDataMeshes() data.TryFixDepth(); data.SwitchToWorldCoordinates(); //data.ComputePositionInformations(); - } + }*/ //if (File.Exists(outputFName)) //{ // SFXDataMeshConverter previousCaption = new SFXDataMeshConverter(); diff --git a/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs b/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs index 3ffb9319e..def78bf7c 100644 --- a/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs +++ b/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs @@ -21,7 +21,10 @@ public static void PlayMovieMusic(String movieName, Int32 offsetTimeMSec = 0) Int32 movieSoundIndex = SoundLib.GetMovieSoundIndex(movieName); if (movieSoundIndex != -1) { - SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio); + //if (movieName == "FMV000") + // SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio); + //else + SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio); } else { @@ -40,6 +43,7 @@ public static Int32 GetMovieSoundIndex(String movieName) if (String.Equals(movieName, "FMV000")) { soundName = "Sounds01/BGM_/music033"; + //return SoundMetaData.GetSoundIndex(soundName, SoundProfileType.Music); } else if (String.Equals(movieName, "FMV059")) { diff --git a/Assembly-CSharp/Global/TileSystem/TileSystem.cs b/Assembly-CSharp/Global/TileSystem/TileSystem.cs index bae9ca359..d7eef59bd 100644 --- a/Assembly-CSharp/Global/TileSystem/TileSystem.cs +++ b/Assembly-CSharp/Global/TileSystem/TileSystem.cs @@ -772,7 +772,7 @@ public Overlay GetOverlay(int num) { return _overlays[num]; } - catch (Exception e) + catch (Exception) { return null; } diff --git a/Assembly-CSharp/Global/ff9/ff9.cs b/Assembly-CSharp/Global/ff9/ff9.cs index c2564d3d9..3fc1825d2 100644 --- a/Assembly-CSharp/Global/ff9/ff9.cs +++ b/Assembly-CSharp/Global/ff9/ff9.cs @@ -3878,8 +3878,8 @@ public static void w_effectUpdate() } else if (no == 25) { - if (worldSPS.frame >= 3) - ; + //if (worldSPS.frame >= 3) + // ; } else if (no == 32) { diff --git a/Assembly-CSharp/Memoria/Assets/Text/AudioResources.cs b/Assembly-CSharp/Memoria/Assets/Text/AudioResources.cs index bb62e2df6..2b41dbeec 100644 --- a/Assembly-CSharp/Memoria/Assets/Text/AudioResources.cs +++ b/Assembly-CSharp/Memoria/Assets/Text/AudioResources.cs @@ -79,7 +79,7 @@ public static Boolean TryAppendDisplayName(String relativePath, out String direc fileName = relativePath.Substring(index + 1); } - bool skipRename = false; + //bool skipRename = false; // Find a display name String displayName; if (fileName.Length == 8 && fileName.StartsWith("music")) // music??? @@ -96,7 +96,7 @@ public static Boolean TryAppendDisplayName(String relativePath, out String direc { string[] pathParts = directoryPath.Split(new char[] { '/' }); displayName = fileName; - skipRename = true; + //skipRename = true; } // TODO: FMV, SE, Songs else diff --git a/Assembly-CSharp/Memoria/Battle/SFX/BattleActionCode.cs b/Assembly-CSharp/Memoria/Battle/SFX/BattleActionCode.cs index 8878b3a33..00697c217 100644 --- a/Assembly-CSharp/Memoria/Battle/SFX/BattleActionCode.cs +++ b/Assembly-CSharp/Memoria/Battle/SFX/BattleActionCode.cs @@ -163,7 +163,7 @@ public Boolean TryGetArgSoundType(String key, out SoundProfileType value) value = (SoundProfileType)Enum.Parse(typeof(SoundProfileType), args); return true; } - catch (Exception err) + catch (Exception) { return false; } @@ -195,7 +195,7 @@ public Boolean TryGetArgSFX(String key, BTL_DATA caster, out SpecialEffect value value = (SpecialEffect)Enum.Parse(typeof(SpecialEffect), args); return true; } - catch (Exception err) + catch (Exception) { return false; } @@ -294,7 +294,7 @@ public Boolean TryGetArgAnimation(String key, BTL_DATA btl, out String value) else return false; } - catch (Exception err) + catch (Exception) { value = args; try diff --git a/Assembly-CSharp/Memoria/Battle/SFX/ParametricMovement.cs b/Assembly-CSharp/Memoria/Battle/SFX/ParametricMovement.cs index fdf3be910..82d9496be 100644 --- a/Assembly-CSharp/Memoria/Battle/SFX/ParametricMovement.cs +++ b/Assembly-CSharp/Memoria/Battle/SFX/ParametricMovement.cs @@ -249,7 +249,7 @@ public static Boolean TryParseInterpolateType(String s, out InterpolateType t) t = (InterpolateType)Enum.Parse(typeof(InterpolateType), s); return true; } - catch (Exception err) + catch (Exception) { t = InterpolateType.Constant; return false; diff --git a/Assembly-CSharp/Memoria/Battle/SFX/SFXBinaryFile.cs b/Assembly-CSharp/Memoria/Battle/SFX/SFXBinaryFile.cs index 21d82d0c0..09f74a4f4 100644 --- a/Assembly-CSharp/Memoria/Battle/SFX/SFXBinaryFile.cs +++ b/Assembly-CSharp/Memoria/Battle/SFX/SFXBinaryFile.cs @@ -134,32 +134,32 @@ public void Load(Byte[] sfxBinary) } while (sequence[sequence.Count - 1].code != SequenceCode.CODE.END); - // DEBUG - if (false) + // DEBUG + /*if (false) { String[] EffectPointType = new String[] { "Effect", "Figure" }; Dictionary CharacterCode = new Dictionary{ - { 0, "FirstTarget" }, - { 1, "SecondTarget" }, - { 2, "ThirdTarget" }, - { 3, "FourthTarget" }, - { 4, "FifthTarget" }, - { 5, "SixthTarget" }, - { 6, "SeventhTarget" }, - { 7, "EighthTarget" }, - { 0x10, "Caster" }, - { 0xFF, "AllTargets" } - }; + { 0, "FirstTarget" }, + { 1, "SecondTarget" }, + { 2, "ThirdTarget" }, + { 3, "FourthTarget" }, + { 4, "FifthTarget" }, + { 5, "SixthTarget" }, + { 6, "SeventhTarget" }, + { 7, "EighthTarget" }, + { 0x10, "Caster" }, + { 0xFF, "AllTargets" } + }; Dictionary ShowHideCode = new Dictionary{ - { 0, "Char=AllPlayers ; Enable=True" }, - { 1, "Char=AllEnemies ; Enable=True" }, - { 2, "Char=Everyone ; Enable=True" }, - { 4, "Char=AllPlayers ; Enable=False" }, - { 5, "Char=AllEnemies ; Enable=False" }, - { 6, "Char=Everyone ; Enable=False" }, - { 9, "Char=Caster ; Enable=True" }, - { 13, "Char=Caster ; Enable=False" } - }; + { 0, "Char=AllPlayers ; Enable=True" }, + { 1, "Char=AllEnemies ; Enable=True" }, + { 2, "Char=Everyone ; Enable=True" }, + { 4, "Char=AllPlayers ; Enable=False" }, + { 5, "Char=AllEnemies ; Enable=False" }, + { 6, "Char=Everyone ; Enable=False" }, + { 9, "Char=Caster ; Enable=True" }, + { 13, "Char=Caster ; Enable=False" } + }; String sequenceString = ""; List randomCameras = new List(); for (Int32 i = 0; i < sequence.Count; i++) @@ -222,10 +222,10 @@ public void Load(Byte[] sfxBinary) Log.Message(ress); } } - } - } + }*/ + } - public class SequenceCode + public class SequenceCode { public CODE code; public Byte arg1; diff --git a/Assembly-CSharp/Memoria/Configuration/Access/Graphics.cs b/Assembly-CSharp/Memoria/Configuration/Access/Graphics.cs index 0290d942a..cf1180363 100644 --- a/Assembly-CSharp/Memoria/Configuration/Access/Graphics.cs +++ b/Assembly-CSharp/Memoria/Configuration/Access/Graphics.cs @@ -30,7 +30,14 @@ public static Boolean InitializeWidescreenSupport() if (Instance._debug.Enabled && Instance._debug.StartFieldCreator) return false; - if (Math.Abs(((Double)Screen.width / (Double)Screen.height) - (16d / 9d)) < 0.001) + if ((Math.Abs(((Double)Screen.width / (Double)Screen.height) - (16d / 9d)) < 0.01) || (Math.Abs(((Double)Screen.width / (Double)Screen.height) - (16d / 10d)) < 0.01)) + return true; + + return false; + } + public static Boolean ScreenIs16to10() + { + if (Math.Abs(((Double)Screen.width / (Double)Screen.height) - (16d / 10d)) < 0.01) return true; return false; diff --git a/Assembly-CSharp/Memoria/Configuration/Memoria.ini b/Assembly-CSharp/Memoria/Configuration/Memoria.ini index 9c48adb45..a907a93ae 100644 --- a/Assembly-CSharp/Memoria/Configuration/Memoria.ini +++ b/Assembly-CSharp/Memoria/Configuration/Memoria.ini @@ -31,7 +31,7 @@ PriorityToOGG = 0 ; SkipIntros (default 0) 0 = Don't skip / 1 = Skip logos / 2 = Skip logos and movie / 3 = Don't loop at the title ; GarnetHair (default 0) 0 = Default / 1 = Long / 2 = Short ; TileSize (default 32) Vanilla 32 / Moguri Mod 64 - ; AntiAliasing (default 0) Must be either 0, 2, 4 or 8: enable Unity's anti-aliasing algorithm to improve the render of 3D model edges + ; AntiAliasing (default 8) Must be either 0, 2, 4 or 8: enable Unity's anti-aliasing algorithm to improve the render of 3D model edges Enabled = 0 BattleFPS = 30 BattleTPS = 15 @@ -46,7 +46,7 @@ WidescreenSupport = 1 SkipIntros = 0 GarnetHair = 0 TileSize = 32 -AntiAliasing = 0 +AntiAliasing = 8 [Control] ; DisableMouse (default 0) 0 = Can use the mouse to navigate in menus and move on the fields / 7 = Disable the mouse completly / 1 = Disable mouse for field menus and dialogs / 2 = Disable mouse for field movements / 4 = Disable mouse for battle menus diff --git a/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs b/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs index 90444390e..e3a89628e 100644 --- a/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs +++ b/Assembly-CSharp/Memoria/VoiceActing/BattleVoice.cs @@ -437,7 +437,7 @@ private static void ParseEffect(String effectCode) speak.playerId = (CharacterId)Enum.Parse(typeof(CharacterId), charArgToken[0]); newSpeakers.Add(speak); } - catch (Exception err) + catch (Exception) { Log.Warning($"[{nameof(BattleVoice)}] Unrecognized player character {charArgToken[0]}"); } @@ -540,7 +540,7 @@ private static void ParseEffect(String effectCode) if (statusMatch.Success) newEffect.Status = (BattleStatus)Enum.Parse(typeof(BattleStatus), statusMatch.Groups[1].Value); } - catch (Exception err) + catch (Exception) { } if (newEffect.Status == 0) diff --git a/Assembly-CSharp/Memoria/VoiceActing/VoicePlayer.cs b/Assembly-CSharp/Memoria/VoiceActing/VoicePlayer.cs index 4bf11a2b5..4300b3bf2 100644 --- a/Assembly-CSharp/Memoria/VoiceActing/VoicePlayer.cs +++ b/Assembly-CSharp/Memoria/VoiceActing/VoicePlayer.cs @@ -61,7 +61,7 @@ public void StartSound(SoundProfile soundProfile, Action onFinished = null) } watcherOfSound.Remove(soundProfile); } - catch (Exception err) + catch (Exception) { watcherOfSound.Remove(soundProfile); } diff --git a/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcLexer.cs b/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcLexer.cs index d3bb15419..379afc411 100644 --- a/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcLexer.cs +++ b/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcLexer.cs @@ -12,7 +12,6 @@ using List = System.Collections.IList; using ArrayList = System.Collections.Generic.List; -[System.CLSCompliant(false)] public partial class NCalcLexer : Antlr.Runtime.Lexer { public const int EOF=-1; diff --git a/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcParser.cs b/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcParser.cs index 00c7a1caf..ac668f971 100644 --- a/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcParser.cs +++ b/Assembly-CSharp/NCalc/Evaluant.Calculator/NCalcParser.cs @@ -21,7 +21,6 @@ using Antlr.Runtime.Tree; using RewriteRuleITokenStream = Antlr.Runtime.Tree.RewriteRuleTokenStream; -[System.CLSCompliant(false)] public partial class NCalcParser : Antlr.Runtime.Parser { internal static readonly string[] tokenNames = new string[] { diff --git a/Memoria.Launcher/Ini/Memoria.ini b/Memoria.Launcher/Ini/Memoria.ini index 9c48adb45..a907a93ae 100644 --- a/Memoria.Launcher/Ini/Memoria.ini +++ b/Memoria.Launcher/Ini/Memoria.ini @@ -31,7 +31,7 @@ PriorityToOGG = 0 ; SkipIntros (default 0) 0 = Don't skip / 1 = Skip logos / 2 = Skip logos and movie / 3 = Don't loop at the title ; GarnetHair (default 0) 0 = Default / 1 = Long / 2 = Short ; TileSize (default 32) Vanilla 32 / Moguri Mod 64 - ; AntiAliasing (default 0) Must be either 0, 2, 4 or 8: enable Unity's anti-aliasing algorithm to improve the render of 3D model edges + ; AntiAliasing (default 8) Must be either 0, 2, 4 or 8: enable Unity's anti-aliasing algorithm to improve the render of 3D model edges Enabled = 0 BattleFPS = 30 BattleTPS = 15 @@ -46,7 +46,7 @@ WidescreenSupport = 1 SkipIntros = 0 GarnetHair = 0 TileSize = 32 -AntiAliasing = 0 +AntiAliasing = 8 [Control] ; DisableMouse (default 0) 0 = Can use the mouse to navigate in menus and move on the fields / 7 = Disable the mouse completly / 1 = Disable mouse for field menus and dialogs / 2 = Disable mouse for field movements / 4 = Disable mouse for battle menus diff --git a/Memoria.Launcher/Languages/Lang.cs b/Memoria.Launcher/Languages/Lang.cs index 3692cdabf..f889769f6 100644 --- a/Memoria.Launcher/Languages/Lang.cs +++ b/Memoria.Launcher/Languages/Lang.cs @@ -164,6 +164,7 @@ private static String GetSettings(string name) public static readonly string BattleInterfaceTooltip = GetSettings(nameof(BattleInterfaceTooltip)); public static readonly string SkipIntrosToMainMenu = GetSettings(nameof(SkipIntrosToMainMenu)); public static readonly string SkipBattleSwirl = GetSettings(nameof(SkipBattleSwirl)); + public static readonly string AntiAliasing = GetSettings(nameof(AntiAliasing)); public static readonly string SkipBattleLoading = GetSettings(nameof(SkipBattleLoading)); public static readonly string HideCardsBubbles = GetSettings(nameof(HideCardsBubbles)); public static readonly string HideSteamBubbles = GetSettings(nameof(HideSteamBubbles)); @@ -207,7 +208,8 @@ private static String GetSettings(string name) public static readonly string SBUIenabled = GetSettings(nameof(SBUIenabled)); public static readonly string BattleTPS = GetSettings(nameof(BattleTPS)); public static readonly string SharedFPS = GetSettings(nameof(SharedFPS)); - + public static readonly string UseOrchestralMusic = GetSettings(nameof(UseOrchestralMusic)); + public static readonly string Use30FpsVideo = GetSettings(nameof(Use30FpsVideo)); } public static class SdLib diff --git a/Memoria.Launcher/Languages/en.xml b/Memoria.Launcher/Languages/en.xml index 005cb853b..3f39ec0fc 100644 --- a/Memoria.Launcher/Languages/en.xml +++ b/Memoria.Launcher/Languages/en.xml @@ -43,7 +43,7 @@ Debuggable = " Debuggable" CheckUpdates = " Check for updates" IniOptions = "Options" - Widescreen = " Widescreen (16:9)" + Widescreen = " Widescreen (16:9 or 16:10)" BattleInterface = "Battle HUD" BattleInterfaceType0 = "Big" BattleInterfaceType1 = "Small" @@ -51,10 +51,11 @@ BattleInterfaceTooltip = "You may customize the interface in-game by pressing Alt+F1" SkipIntrosToMainMenu = " Skip intros to main menu" SkipBattleSwirl = " Skip battle swirl" + AntiAliasing = " Anti-aliasing" SkipBattleLoading = "Frames to load battle" HideCardsBubbles = " Hide cards bubbles" HideSteamBubbles = " Show only PSX bubbles" - HideSteamBubblesTooltip = "Disables 'card', 'beach' bubbles and NPC interaction bubbles" + HideSteamBubblesTooltip = "Disables 'card', 'beach' bubbles and NPC interaction bubbles" TurnBasedBattles = " Turn-based battles" SpeedChoice = "ATB Mode" SpeedChoiceType0 = "Normal" @@ -63,14 +64,14 @@ SpeedChoiceType3 = "Dynamic (1)" SpeedChoiceType4 = "Dynamic (2)" SpeedChoiceType5 = "Dynamic" - SpeedChoiceTooltip = "Normal: default mode Fast: the ATB fills up immediately during idling times Turn-based: ATB stops during a character turn Dynamic: characters and enemies can act simultaneously" + SpeedChoiceTooltip = "Normal: default mode Fast: the ATB fills up immediately during idling times Turn-based: ATB stops during a character turn Dynamic: characters and enemies can act simultaneously" TripleTriad = "Card game" TripleTriadType0 = "Tetra Master" TripleTriadType1 = "Tetra Triad" TripleTriadType2 = "Triple Triad" Volume = "Volume:" SoundVolume = "🔊Sound" - MusicVolume = "🔊Music" + MusicVolume = "🎵Music" MovieVolume = "🔊Movie" IniCheats = "Cheats" MaxStealRate = " 100% steal rate" @@ -81,7 +82,7 @@ AccessBattleMenuType1 = "Limited access" AccessBattleMenuType2 = "Individual access" AccessBattleMenuType3 = "Unlimited access" - AccessBattleMenuTooltip = "If the 'Menu' command does not appear, access the menu with the button △/Y from the 'Item' command In limited access, using the menu costs a turn" + AccessBattleMenuTooltip = "If the 'Menu' command does not appear, access the menu with the button △/Y from the 'Item' command In limited access, using the menu costs a turn" SpeedMode = " Speed mode | F1" SpeedFactor = "Speed" BattleAssistance = " Battle cheats | F2 F3" @@ -94,7 +95,8 @@ SBUIenabled = "Scaled Battle UI" BattleTPS = "Battle speed (def. 15)" SharedFPS = "Frames Per Second" - + UseOrchestralMusic = "Orchestral music (Moguri)" + Use30FpsVideo = "30 FPS video (Moguri)" /> - +