Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.
Swift
Enhance the RetroAchievements list experience; fix crashes that might be caused by rumble; remove Snes9X code.
Daiuno4476df22021f
diff --git a/Cores/Libretro/input/drivers_joypad/manic_joypad.m b/Cores/Libretro/input/drivers_joypad/manic_joypad.mindex 7b216c7b..ac5d55e3 100644--- a/Cores/Libretro/input/drivers_joypad/manic_joypad.m+++ b/Cores/Libretro/input/drivers_joypad/manic_joypad.m@@ -40,11 +40,19 @@#ifdef HAVE_COREMOTION#import <CoreHaptics/CoreHaptics.h>-static CHHapticEngine *hapticEngine;-// 使用 id 类型来避免编译错误-static id strongRumblePlayer;-static id weakRumblePlayer;-static bool hapticsSupported = false;+// 触觉引擎状态管理+typedef struct {+ CHHapticEngine *hapticEngine;+ id strongRumblePlayer;+ id weakRumblePlayer;+ bool hapticsSupported;+ bool isEngineRunning;+ bool isShuttingDown;+ uint64_t lastRumbleTime[2]; // 记录每种震动类型的最后执行时间+ uint16_t lastRumbleStrength[2]; // 记录每种震动类型的最后强度+} manic_haptic_state_t;++static manic_haptic_state_t hapticState = {0};#endif/* TODO/FIXME - static globals */@@ -52,8 +60,61 @@ static uint32_t manic_buttons[MAX_USERS];static int16_t manic_axes[MAX_USERS][MAX_MANIC_AXES];static bool manic_inited;+#ifdef HAVE_COREMOTION+// 清理触觉引擎资源+void manic_cleanup_haptic_engine(void) {+ if (@available(iOS 13.0, *)) {+ hapticState.isShuttingDown = true;++ // 停止所有正在运行的震动+ if (hapticState.strongRumblePlayer) {+ if ([hapticState.strongRumblePlayer respondsToSelector:@selector(stopAtTime:error:)]) {+ [hapticState.strongRumblePlayer performSelector:@selector(stopAtTime:error:)+ withObject:@0+ withObject:nil];+ }+ hapticState.strongRumblePlayer = nil;+ }++ if (hapticState.weakRumblePlayer) {+ if ([hapticState.weakRumblePlayer respondsToSelector:@selector(stopAtTime:error:)]) {+ [hapticState.weakRumblePlayer performSelector:@selector(stopAtTime:error:)+ withObject:@0+ withObject:nil];+ }+ hapticState.weakRumblePlayer = nil;+ }++ // 停止并清理引擎+ if (hapticState.hapticEngine) {+ [hapticState.hapticEngine stopWithCompletionHandler:^(NSError * _Nullable error) {+ hapticState.hapticEngine = nil;+ }];+ }++ // 重置状态+ // 手动重置结构体字段,而不是使用 memset+ hapticState.hapticEngine = nil;+ hapticState.strongRumblePlayer = nil;+ hapticState.weakRumblePlayer = nil;+ hapticState.hapticsSupported = false;+ hapticState.isEngineRunning = false;+ hapticState.isShuttingDown = false;+ hapticState.lastRumbleTime[0] = 0;+ hapticState.lastRumbleTime[1] = 0;+ hapticState.lastRumbleStrength[0] = 0;+ hapticState.lastRumbleStrength[1] = 0;+ }+}+#endifvoid manic_input_set_deinit(void) {+ if (manic_inited) {+#ifdef HAVE_COREMOTION+ // 清理触觉引擎资源+ manic_cleanup_haptic_engine();+#endif+ }manic_inited = false;}@@ -195,11 +256,62 @@ static void manic_gamecontroller_joypad_poll(void) { }#endif-// 创建默认的触觉模式#ifdef HAVE_COREMOTION+// 检查震动是否应该被忽略(防止重复调用)+static bool manic_should_ignore_rumble(enum retro_rumble_effect type, uint16_t strength) {+ if (@available(iOS 13.0, *)) {+ uint64_t currentTime = mach_absolute_time();+ uint64_t timeDiff = currentTime - hapticState.lastRumbleTime[type];++ // 如果强度相同且在50ms内重复调用,则忽略+ if (hapticState.lastRumbleStrength[type] == strength &&+ timeDiff < 50000000) { // 50ms in nanoseconds+ return true;+ }++ // 更新记录+ hapticState.lastRumbleTime[type] = currentTime;+ hapticState.lastRumbleStrength[type] = strength;+ }+ return false;+}++// 安全地启动震动模式+static bool manic_safe_start_rumble(id player) {+ if (@available(iOS 13.0, *)) {+ if (!player || hapticState.isShuttingDown || !hapticState.isEngineRunning) {+ return false;+ }++ @try {+ if ([player respondsToSelector:@selector(startAtTime:error:)]) {+ NSError *error = nil;+ BOOL success = [player startAtTime:0 error:&error];+ if (error) {+ // 如果引擎已停止,尝试重新启动+ if (hapticState.hapticEngine) {+ [hapticState.hapticEngine startWithCompletionHandler:^(NSError * _Nullable startError) {+ if (!startError) {+ hapticState.isEngineRunning = YES;+ }+ }];+ }+ return false;+ }+ return success;+ }+ } @catch (NSException *exception) {+ // 捕获异常,防止崩溃+ return false;+ }+ }+ return false;+}++// 创建默认的触觉模式static void manic_create_default_haptic_patterns(void) {if (@available(iOS 13.0, *)) {- if (!hapticEngine || !hapticsSupported) return;+ if (!hapticState.hapticEngine || !hapticState.hapticsSupported) return;// 创建强震动模式 (RETRO_RUMBLE_STRONG)CHHapticEvent *strongEvent = [[CHHapticEvent alloc] initWithEventType:CHHapticEventTypeHapticTransient@@ -211,7 +323,7 @@ static void manic_create_default_haptic_patterns(void) {CHHapticPattern *strongPattern = [[CHHapticPattern alloc] initWithEvents:@[strongEvent] parameters:@[] error:nil];if (strongPattern) {- strongRumblePlayer = [hapticEngine createPlayerWithPattern:strongPattern error:nil];+ hapticState.strongRumblePlayer = [hapticState.hapticEngine createPlayerWithPattern:strongPattern error:nil];}// 创建弱震动模式 (RETRO_RUMBLE_WEAK)@@ -224,7 +336,7 @@ static void manic_create_default_haptic_patterns(void) {CHHapticPattern *weakPattern = [[CHHapticPattern alloc] initWithEvents:@[weakEvent] parameters:@[] error:nil];if (weakPattern) {- weakRumblePlayer = [hapticEngine createPlayerWithPattern:weakPattern error:nil];+ hapticState.weakRumblePlayer = [hapticState.hapticEngine createPlayerWithPattern:weakPattern error:nil];}}}@@ -232,7 +344,9 @@ static void manic_create_default_haptic_patterns(void) {// 创建自定义震动模式static id manic_create_custom_rumble_pattern(float intensity, float sharpness, float duration) {if (@available(iOS 13.0, *)) {- if (!hapticEngine || !hapticsSupported) return nil;+ if (!hapticState.hapticEngine || !hapticState.hapticsSupported || hapticState.isShuttingDown) {+ return nil;+ }// 创建多个震动事件来模拟持续的震动效果NSMutableArray *events = [[NSMutableArray alloc] init];@@ -251,7 +365,7 @@ static id manic_create_custom_rumble_pattern(float intensity, float sharpness, fCHHapticPattern *pattern = [[CHHapticPattern alloc] initWithEvents:events parameters:@[] error:nil];if (pattern) {- return [hapticEngine createPlayerWithPattern:pattern error:nil];+ return [hapticState.hapticEngine createPlayerWithPattern:pattern error:nil];}}return nil;@@ -264,32 +378,44 @@ void *manic_gamecontroller_joypad_init(void *data) {#ifdef HAVE_COREMOTION// 初始化 Core Haptics- if (@available(iOS 13.0, *)) {- if (CHHapticEngine.capabilitiesForHardware.supportsHaptics) {- NSError *error = nil;- hapticEngine = [[CHHapticEngine alloc] initAndReturnError:&error];- if (hapticEngine && !error) {- hapticEngine.autoShutdownEnabled = YES;-- // 启动 haptic engine- [hapticEngine startWithCompletionHandler:^(NSError * _Nullable error) {- if (error) {- hapticsSupported = false;- } else {- hapticsSupported = true;- // 创建默认的震动模式- manic_create_default_haptic_patterns();- }- }];+ if (@available(iOS 13.0, *)) {+ if (CHHapticEngine.capabilitiesForHardware.supportsHaptics) {+ NSError *error = nil;+ hapticState.hapticEngine = [[CHHapticEngine alloc] initAndReturnError:&error];+ if (hapticState.hapticEngine && !error) {+ hapticState.hapticEngine.autoShutdownEnabled = YES;++ // 设置引擎停止回调+ hapticState.hapticEngine.stoppedHandler = ^(CHHapticEngineStoppedReason reason) {+ hapticState.isEngineRunning = NO;+ hapticState.strongRumblePlayer = nil;+ hapticState.weakRumblePlayer = nil;+ };++ // 启动 haptic engine+ [hapticState.hapticEngine startWithCompletionHandler:^(NSError * _Nullable error) {+ if (error) {+ hapticState.hapticsSupported = false;+ hapticState.isEngineRunning = false;+ } else {+ hapticState.hapticsSupported = true;+ hapticState.isEngineRunning = true;+ // 创建默认的震动模式+ manic_create_default_haptic_patterns();+ }+ }];+ } else {+ hapticState.hapticsSupported = false;+ hapticState.isEngineRunning = false;+ }} else {- hapticsSupported = false;+ hapticState.hapticsSupported = false;+ hapticState.isEngineRunning = false;}} else {- hapticsSupported = false;+ hapticState.hapticsSupported = false;+ hapticState.isEngineRunning = false;}- } else {- hapticsSupported = false;- }#endifmanic_inited = true;@@ -299,7 +425,9 @@ void *manic_gamecontroller_joypad_init(void *data) {return (void*)-1;}-static void manic_gamecontroller_joypad_destroy(void) {}+static void manic_gamecontroller_joypad_destroy(void) {+ manic_input_set_deinit();+}static int32_t manic_gamecontroller_joypad_button(unsigned port, uint16_t joykey) {if (port >= DEFAULT_MAX_PADS)@@ -374,21 +502,27 @@ static bool manic_gamecontroller_joypad_set_rumble(unsigned pad,return false;}- if (@available(iOS 14.0, macOS 11.0, tvOS 14.0, *)) {- for (GCController *controller in [GCController controllers]) {- if (!controller)- continue;- if (!controller.motion)- continue;- if (controller.motion.sensorsRequireManualActivation) {- controller.motion.sensorsActive = YES;- }- }- }-#ifdef HAVE_COREMOTIONif (@available(iOS 13.0, *)) {- if (!hapticsSupported || !hapticEngine) {+ // 检查是否应该忽略重复的震动调用+ if (manic_should_ignore_rumble(type, strength)) {+ return true; // 返回true表示"成功",但实际不执行+ }++ // 检查引擎状态+ if (!hapticState.hapticsSupported || !hapticState.hapticEngine || hapticState.isShuttingDown) {+ return false;+ }++ // 如果引擎未运行,尝试重新启动+ if (!hapticState.isEngineRunning) {+ [hapticState.hapticEngine startWithCompletionHandler:^(NSError * _Nullable error) {+ if (!error) {+ hapticState.isEngineRunning = YES;+ // 重新创建默认模式+ manic_create_default_haptic_patterns();+ }+ }];return false;}@@ -405,11 +539,12 @@ static bool manic_gamecontroller_joypad_set_rumble(unsigned pad,id player = manic_create_custom_rumble_pattern(intensity, sharpness, duration);if (player) {- // 使用 performSelector 来避免类型问题- if ([player respondsToSelector:@selector(startAtTime:error:)]) {- [player performSelector:@selector(startAtTime:error:) withObject:@0 withObject:nil];- return true;- }+ return manic_safe_start_rumble(player);+ }++ // 如果自定义模式创建失败,尝试使用默认模式+ if (hapticState.strongRumblePlayer) {+ return manic_safe_start_rumble(hapticState.strongRumblePlayer);}break;}@@ -422,10 +557,12 @@ static bool manic_gamecontroller_joypad_set_rumble(unsigned pad,id player = manic_create_custom_rumble_pattern(intensity, sharpness, duration);if (player) {- if ([player respondsToSelector:@selector(startAtTime:error:)]) {- [player performSelector:@selector(startAtTime:error:) withObject:@0 withObject:nil];- return true;- }+ return manic_safe_start_rumble(player);+ }++ // 如果自定义模式创建失败,尝试使用默认模式+ if (hapticState.weakRumblePlayer) {+ return manic_safe_start_rumble(hapticState.weakRumblePlayer);}break;}@@ -433,19 +570,6 @@ static bool manic_gamecontroller_joypad_set_rumble(unsigned pad,default:return false;}-- // 如果自定义模式创建失败,尝试使用默认模式- if (type == RETRO_RUMBLE_STRONG && strongRumblePlayer) {- if ([strongRumblePlayer respondsToSelector:@selector(startAtTime:error:)]) {- [strongRumblePlayer performSelector:@selector(startAtTime:error:) withObject:@0 withObject:nil];- return true;- }- } else if (type == RETRO_RUMBLE_WEAK && weakRumblePlayer) {- if ([weakRumblePlayer respondsToSelector:@selector(startAtTime:error:)]) {- [weakRumblePlayer performSelector:@selector(startAtTime:error:) withObject:@0 withObject:nil];- return true;- }- }}#endifdiff --git a/Cores/snes9x.libretro.framework/Info.plist b/Cores/snes9x.libretro.framework/Info.plistdeleted file mode 100644index bfe56a31..00000000--- a/Cores/snes9x.libretro.framework/Info.plist+++ /dev/null@@ -1,3 +0,0 @@-version https://git-lfs.github.com/spec/v1-oid sha256:f35f7d9783525feb097be1092d89851679e3a4c58aa47c2a9e997a338c84e099-size 715diff --git a/Cores/snes9x.libretro.framework/_CodeSignature/CodeResources b/Cores/snes9x.libretro.framework/_CodeSignature/CodeResourcesdeleted file mode 100644index c230a976..00000000--- a/Cores/snes9x.libretro.framework/_CodeSignature/CodeResources+++ /dev/null@@ -1,3 +0,0 @@-version https://git-lfs.github.com/spec/v1-oid sha256:50d5d1ec60eb7bc22fd420e9ffe64cd4fbd3ef5fccbe12f86b09565510b8be67-size 1798diff --git a/Cores/snes9x.libretro.framework/snes9x.libretro b/Cores/snes9x.libretro.framework/snes9x.libretrodeleted file mode 100755index dd0dfaf2..00000000--- a/Cores/snes9x.libretro.framework/snes9x.libretro+++ /dev/null@@ -1,3 +0,0 @@-version https://git-lfs.github.com/spec/v1-oid sha256:11441436c4dcae8c6875ee05830689b8d16f20a400c240b4e00454e936377106-size 2525312diff --git a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj b/ManicEmu/ManicEmu.xcodeproj/project.pbxprojindex c3f2cc80..965c3e92 100644--- a/ManicEmu/ManicEmu.xcodeproj/project.pbxproj+++ b/ManicEmu/ManicEmu.xcodeproj/project.pbxproj@@ -650,7 +650,6 @@57BFBE792DD336FC00AABF98 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57BFBE782DD336F100AABF98 /* Application.swift */; };57BFBE902DD435C900AABF98 /* PSP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57BFBE8F2DD435C700AABF98 /* PSP.swift */; };57C8A11A2DF2BA3E00593F82 /* SNES.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57C8A1192DF2BA3500593F82 /* SNES.swift */; };- 57C8A1232DF2BD2700593F82 /* snes9x.libretro.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 57C8A1212DF2BD1A00593F82 /* snes9x.libretro.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };57CC338E2DBC78AE00DF7418 /* FlexSkinSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CC338D2DBC789E00DF7418 /* FlexSkinSettingViewController.swift */; };57CC33BA2DBCD90700DF7418 /* AuxiliaryLineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CC33B92DBCD90700DF7418 /* AuxiliaryLineView.swift */; };57CC33BE2DBCDF3400DF7418 /* CGRectExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57CC33BD2DBCDF2C00DF7418 /* CGRectExtensions.swift */; };@@ -816,7 +815,6 @@57DCE8542E0F978B0079E3AA /* yabause.libretro.framework in Embed Frameworks */,57DCE7A12E0C434C0079E3AA /* mednafen.saturn.libretro.framework in Embed Frameworks */,57655C222DF6B970003E4A6E /* picodrive.libretro.framework in Embed Frameworks */,- 57C8A1232DF2BD2700593F82 /* snes9x.libretro.framework in Embed Frameworks */,57F0D83E2DE2C5AE00760F57 /* nestopia.libretro.framework in Embed Frameworks */,57BFBE732DD3361800AABF98 /* ppsspp.libretro.framework in Embed Frameworks */,57BFBE1E2DD32F7700AABF98 /* Libretro.framework in Embed Frameworks */,@@ -1655,7 +1653,6 @@57BFBE782DD336F100AABF98 /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };57BFBE8F2DD435C700AABF98 /* PSP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PSP.swift; sourceTree = "<group>"; };57C8A1192DF2BA3500593F82 /* SNES.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SNES.swift; sourceTree = "<group>"; };- 57C8A1212DF2BD1A00593F82 /* snes9x.libretro.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = snes9x.libretro.framework; path = ../Cores/snes9x.libretro.framework; sourceTree = SOURCE_ROOT; };57CC338D2DBC789E00DF7418 /* FlexSkinSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlexSkinSettingViewController.swift; sourceTree = "<group>"; };57CC33B92DBCD90700DF7418 /* AuxiliaryLineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuxiliaryLineView.swift; sourceTree = "<group>"; };57CC33BD2DBCDF2C00DF7418 /* CGRectExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGRectExtensions.swift; sourceTree = "<group>"; };@@ -3765,7 +3762,6 @@57DCE8522E0F97780079E3AA /* yabause.libretro.framework */,57DCE79D2E0C43310079E3AA /* mednafen.saturn.libretro.framework */,57655C1E2DF6B94C003E4A6E /* picodrive.libretro.framework */,- 57C8A1212DF2BD1A00593F82 /* snes9x.libretro.framework */,57F0D83C2DE2C59900760F57 /* nestopia.libretro.framework */,57BFBE712DD3360A00AABF98 /* ppsspp.libretro.framework */,);diff --git a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfigindex ac96e6ce..36952fdb 100644--- a/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig+++ b/ManicEmu/ManicEmu/Resources/Config-Base.xcconfig@@ -11,5 +11,5 @@// https://help.apple.com/xcode/#/dev745c5c974APP_BUNDLE_IDENTIFIER = com.aoshuang.manicemu-APP_BUILD_VERSION = 0+APP_BUILD_VERSION = 2APP_VERSION = 1.6.1diff --git a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.stringsindex 91423897..5c389364 100644--- a/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ar.lproj/Localizable.strings@@ -637,4 +637,7 @@"Leaderboard" = "لوحة المتصدرين";"LeaderboardStart" = "بداية اللوحة: ";-"TurnOffHardcoreAlert" = "التبديل إلى الوضع العادي دائم. للعودة إلى الوضع المتقدم، يجب إعادة اللعبة. هل تتابع؟";\ No newline at end of file+"TurnOffHardcoreAlert" = "التبديل إلى الوضع العادي دائم. للعودة إلى الوضع المتقدم، يجب إعادة اللعبة. هل تتابع؟";+"AchievementsMissableAlert" = "لا يمكن الحصول على الإنجاز بعد مرحلة معينة في اللعبة ويتطلب لعبًا آخر إذا فاتك";+"AchievementsProgressionAlert" = "الإنجاز مطلوب لإكمال اللعبة";+"AchievementsWinAlert" = "الإنجاز يشير إلى إكمال اللعبة";diff --git a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.stringsindex 2d3e1cdd..82d78a29 100644--- a/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ca.lproj/Localizable.strings@@ -662,4 +662,7 @@ Prem el botó del control...";"Leaderboard" = "Taula de classificació";"LeaderboardStart" = "Inici taula classificació: ";-"TurnOffHardcoreAlert" = "Canviar al mode Softcore és permanent. Per tornar al mode Hardcore, cal reiniciar el joc. Continuar?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Canviar al mode Softcore és permanent. Per tornar al mode Hardcore, cal reiniciar el joc. Continuar?";+"AchievementsMissableAlert" = "El assoliment no podrà obtenir-se després d'un cert punt i requerirà una nova partida si es perd";+"AchievementsProgressionAlert" = "L'assoliment és necessari per superar el joc";+"AchievementsWinAlert" = "L'assoliment indica que el joc ha estat superat";diff --git a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.stringsindex 1704c956..a23e6206 100644--- a/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/cs.lproj/Localizable.strings@@ -658,4 +658,7 @@ Stiskněte tlačítko ovladače...";"Leaderboard" = "Žebříček";"LeaderboardStart" = "Začátek žebříčku: ";-"TurnOffHardcoreAlert" = "Přepnutí do Softcore režimu je trvalé. Pro návrat do Hardcore režimu musíte hru resetovat. Pokračovat?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Přepnutí do Softcore režimu je trvalé. Pro návrat do Hardcore režimu musíte hru resetovat. Pokračovat?";+"AchievementsMissableAlert" = "Tohoto úspěchu nelze po určitém bodě dosáhnout a vyžaduje při zmeškání nové hraní";+"AchievementsProgressionAlert" = "Tento úspěch je vyžadován k dokončení hry";+"AchievementsWinAlert" = "Tento úspěch indikuje, že hra byla dokončena";diff --git a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.stringsindex 1bc74068..a706b575 100644--- a/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/da.lproj/Localizable.strings@@ -660,4 +660,7 @@ Tryk på controller-knappen...";"Leaderboard" = "Pointtavle";"LeaderboardStart" = "Pointtavle start: ";-"TurnOffHardcoreAlert" = "Skift til Softcore-tilstand er permanent. For at vende tilbage til Hardcore-tilstand, skal du nulstille spillet. Fortsætte?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Skift til Softcore-tilstand er permanent. For at vende tilbage til Hardcore-tilstand, skal du nulstille spillet. Fortsætte?";+"AchievementsMissableAlert" = "Præstationen kan ikke opnås efter et bestemt tidspunkt og kræver en ny gennemspilning hvis misset";+"AchievementsProgressionAlert" = "Præstationen er påkrævet for at gennemføre spillet";+"AchievementsWinAlert" = "Præstationen indikerer at spillet er gennemført";diff --git a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.stringsindex 4cef37a9..9c2448cd 100644--- a/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/de.lproj/Localizable.strings@@ -664,4 +664,7 @@ Drücke die Controller-Taste...";"Leaderboard" = "Bestenliste";"LeaderboardStart" = "Bestenliste Start: ";-"TurnOffHardcoreAlert" = "Das Wechseln in den Softcore-Modus ist permanent. Zur Rückkehr zum Hardcore-Modus muss das Spiel zurückgesetzt werden. Fortfahren?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Das Wechseln in den Softcore-Modus ist permanent. Zur Rückkehr zum Hardcore-Modus muss das Spiel zurückgesetzt werden. Fortfahren?";+"AchievementsMissableAlert" = "Dieser Erfolg kann nach einem bestimmten Punkt nicht mehr erzielt werden und erfordert bei Verpassen einen neuen Spielzug";+"AchievementsProgressionAlert" = "Dieser Erfolg ist zum Abschluss des Spiels erforderlich";+"AchievementsWinAlert" = "Dieser Erfolg zeigt an, dass das Spiel abgeschlossen wurde";diff --git a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.stringsindex 8efe283b..e3dce97b 100644--- a/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/el.lproj/Localizable.strings@@ -663,4 +663,7 @@"Leaderboard" = "Πίνακας Βαθμολογίας";"LeaderboardStart" = "Έναρξη Πίνακα Βαθμολογίας: ";-"TurnOffHardcoreAlert" = "Η εναλλαγή στη λειτουργία Softcore είναι μόνιμη. Για να επιστρέψετε στη λειτουργία Hardcore, πρέπει να επαναφέρετε το παιχνίδι. Συνέχεια?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Η εναλλαγή στη λειτουργία Softcore είναι μόνιμη. Για να επιστρέψετε στη λειτουργία Hardcore, πρέπει να επαναφέρετε το παιχνίδι. Συνέχεια?";+"AchievementsMissableAlert" = "Το επίτευγμα δεν μπορεί να κερδηθεί μετά από ένα σημείο και απαιτεί νέο παιχνίδι αν χαθεί";+"AchievementsProgressionAlert" = "Το επίτευγμα απαιτείται για την ολοκλήρωση του παιχνιδιού";+"AchievementsWinAlert" = "Το επίτευγμα δηλώνει ότι το παιχνίδι έχει ολοκληρωθεί";diff --git a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.stringsindex f5a7d832..3a344bb7 100644--- a/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/en.lproj/Localizable.strings@@ -673,3 +673,7 @@ Press the controller button to complete mapping...";"Leaderboard" = "Leaderboard";"LeaderboardStart" = "Leaderboard Start: ";"TurnOffHardcoreAlert" = "Switching to Softcore is permanent. To return to Hardcore, you must reset the game. Continue?";++"AchievementsMissableAlert" = "The achievement cannot be earned after some point in the playthrough and would require another playthrough if missed";+"AchievementsProgressionAlert" = "The achievement is required to beat the game";+"AchievementsWinAlert" = "The achievement indicates the game has been beaten";diff --git a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.stringsindex 38a6bb81..0141f221 100644--- a/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/es-419.lproj/Localizable.strings@@ -662,4 +662,7 @@ Presiona el botón del control para continuar...";"Leaderboard" = "Tabla de posiciones";"LeaderboardStart" = "Inicio tabla: ";-"TurnOffHardcoreAlert" = "Cambiar a modo Softcore es permanente. Para regresar al modo Hardcore, debes reiniciar el juego. ¿Continuar?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Cambiar a modo Softcore es permanente. Para regresar al modo Hardcore, debes reiniciar el juego. ¿Continuar?";+"AchievementsMissableAlert" = "El logro no se podrá obtener después de cierto punto y requerirá otra partida si se pierde";+"AchievementsProgressionAlert" = "El logro es necesario para terminar el juego";+"AchievementsWinAlert" = "El logro indica que el juego ha sido completado";diff --git a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.stringsindex 79a7220f..61c6c3db 100644--- a/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/es.lproj/Localizable.strings@@ -637,4 +637,7 @@ Presiona el botón del control para completar...";"Leaderboard" = "Clasificación";"LeaderboardStart" = "Inicio clasificación: ";-"TurnOffHardcoreAlert" = "Cambiar al modo Softcore es permanente. Para volver al modo Hardcore, debes reiniciar el juego. ¿Continuar?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Cambiar al modo Softcore es permanente. Para volver al modo Hardcore, debes reiniciar el juego. ¿Continuar?";+"AchievementsMissableAlert" = "El logro no podrá obtenerse después de cierto punto del juego y requerirá otra partida si se pierde";+"AchievementsProgressionAlert" = "El logro es necesario para completar el juego";+"AchievementsWinAlert" = "El logro indica que el juego ha sido completado";diff --git a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.stringsindex 4804bcc0..d3130f54 100644--- a/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fi.lproj/Localizable.strings@@ -663,4 +663,7 @@ Paina ohjaimen nappia...";"Leaderboard" = "Tulostaulukko";"LeaderboardStart" = "Tulostaulukon alku: ";-"TurnOffHardcoreAlert" = "Vaihto Softcore-tilaan on pysyvä. Palataksesi Hardcore-tilaan, sinun on nollattava peli. Jatketaanko?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Vaihto Softcore-tilaan on pysyvä. Palataksesi Hardcore-tilaan, sinun on nollattava peli. Jatketaanko?";+"AchievementsMissableAlert" = "Saavutusta ei voi ansaita tietyn kohdan jälkeen ja se vaatii uuden pelikerran jos menetetään";+"AchievementsProgressionAlert" = "Saavutus vaaditaan pelin läpäisyyn";+"AchievementsWinAlert" = "Saavutus ilmaisee että peli on läpäisty";diff --git a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.stringsindex 29984d7b..b1cda722 100644--- a/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fr-CA.lproj/Localizable.strings@@ -664,4 +664,7 @@ Appuyez sur le bouton du contrôleur...";"Leaderboard" = "Classement";"LeaderboardStart" = "Début classement: ";-"TurnOffHardcoreAlert" = "Le passage au mode Softcore est permanent. Pour revenir au mode Hardcore, vous devez réinitialiser le jeu. Continuer ?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Le passage au mode Softcore est permanent. Pour revenir au mode Hardcore, vous devez réinitialiser le jeu. Continuer ?";+"AchievementsMissableAlert" = "Ce succès ne pourra être obtenu après un certain point et nécessitera une nouvelle partie si manqué";+"AchievementsProgressionAlert" = "Ce succès est requis pour terminer le jeu";+"AchievementsWinAlert" = "Ce succès indique que le jeu est terminé";diff --git a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.stringsindex 03b4776e..ac141990 100644--- a/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/fr.lproj/Localizable.strings@@ -664,4 +664,7 @@ Appuyez sur le bouton du contrôleur...";"Leaderboard" = "Classement";"LeaderboardStart" = "Début classement: ";-"TurnOffHardcoreAlert" = "Le passage en mode Softcore est définitif. Pour retrouver le mode Hardcore, vous devrez réinitialiser le jeu. Continuer ?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Le passage en mode Softcore est définitif. Pour retrouver le mode Hardcore, vous devrez réinitialiser le jeu. Continuer ?";+"AchievementsMissableAlert" = "Ce succès ne pourra plus être débloqué après un certain point et nécessitera une nouvelle partie si manqué";+"AchievementsProgressionAlert" = "Ce succès est nécessaire pour finir le jeu";+"AchievementsWinAlert" = "Ce succès indique que le jeu a été terminé";diff --git a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.stringsindex c24dd1ee..92e375ba 100644--- a/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/he.lproj/Localizable.strings@@ -663,4 +663,7 @@"Leaderboard" = "לוח תוצאות";"LeaderboardStart" = "תחילת לוח תוצאות: ";-"TurnOffHardcoreAlert" = "מעבר למצב סופטקור הוא קבוע. כדי לחזור למצב הארדקור,你必须重置游戏。 להמשיך?";\ No newline at end of file+"TurnOffHardcoreAlert" = "מעבר למצב סופטקור הוא קבוע. כדי לחזור למצב הארדקור,你必须重置游戏。 להמשיך?";+"AchievementsMissableAlert" = "ההישג לא יוכל להתקבל לאחר נקודה מסוימת וידרוש משחק נוסף אם הוחמץ";+"AchievementsProgressionAlert" = "ההישג נדרש כדי לסיים את המשחק";+"AchievementsWinAlert" = "ההישג מעיד שהמשחק הושלם";diff --git a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.stringsindex cf4a83e1..a6aecc25 100644--- a/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hi.lproj/Localizable.strings@@ -664,4 +664,7 @@"Leaderboard" = "लीडरबोर्ड";"LeaderboardStart" = "लीडरबोर्ड Start: ";-"TurnOffHardcoreAlert" = "सॉफ्टकोर मोड में स्विच करना स्थायी है। हार्डकोर मोड में वापस जाने के लिए, आपको गेम रीसेट करना होगा। जारी रखें?";\ No newline at end of file+"TurnOffHardcoreAlert" = "सॉफ्टकोर मोड में स्विच करना स्थायी है। हार्डकोर मोड में वापस जाने के लिए, आपको गेम रीसेट करना होगा। जारी रखें?";+"AchievementsMissableAlert" = "यह उपलब्धि खेल के एक निश्चित बिंदु के बाद अर्जित नहीं की जा सकती और छूटने पर पुनः खेलने की आवश्यकता होगी";+"AchievementsProgressionAlert" = "यह उपलब्धि खेल को पूरा करने के लिए आवश्यक है";+"AchievementsWinAlert" = "यह उपलब्धि दर्शाती है कि खेल पूरा हो चुका है";diff --git a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.stringsindex 1b816c97..478d9679 100644--- a/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hr.lproj/Localizable.strings@@ -660,4 +660,7 @@ Ako naiđete na nestabilnost u 3DS-u, pogledajte «Često Postavljana Pitanja»"Leaderboard" = "Ljestvica";"LeaderboardStart" = "Početak ljestvice: ";-"TurnOffHardcoreAlert" = "Prebacivanje u Softcore način rada je trajno. Za povratak u Hardcore način rada, morate resetirati igru. Nastaviti?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Prebacivanje u Softcore način rada je trajno. Za povratak u Hardcore način rada, morate resetirati igru. Nastaviti?";+"AchievementsMissableAlert" = "Postignuće se ne može zaraditi nakon određene točke i zahtijeva novu igru ako se propusti";+"AchievementsProgressionAlert" = "Postignuće je potrebno za dovršetak igre";+"AchievementsWinAlert" = "Postignuće označava da je igra dovršena";diff --git a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.stringsindex 5ecae64e..ffed8268 100644--- a/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/hu.lproj/Localizable.strings@@ -662,4 +662,7 @@ Nyomja meg a kontroller gombját...";"Leaderboard" = "Ranglista";"LeaderboardStart" = "Ranglista kezdete: ";-"TurnOffHardcoreAlert" = "A Softcore módba váltás végleges. A Hardcore módba való visszatéréshez a játékot alaphelyzetbe kell állítani. Folytatja?";\ No newline at end of file+"TurnOffHardcoreAlert" = "A Softcore módba váltás végleges. A Hardcore módba való visszatéréshez a játékot alaphelyzetbe kell állítani. Folytatja?";+"AchievementsMissableAlert" = "A teljesítmény egy pont után nem szerezhető meg és új játékot igényel ha kimarad";+"AchievementsProgressionAlert" = "A teljesítmény szükséges a játék befejezéséhez";+"AchievementsWinAlert" = "A teljesítmény jelzi, hogy a játék befejeződött";diff --git a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.stringsindex 401acd56..acfe2538 100644--- a/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/id.lproj/Localizable.strings@@ -655,4 +655,7 @@ Tekan tombol kontroler...";"Leaderboard" = "Papan peringkat";"LeaderboardStart" = "Mulai papan peringkat: ";-"TurnOffHardcoreAlert" = "Beralih ke mode Softcore bersifat permanen. Untuk kembali ke mode Hardcore, Anda harus reset game. Lanjutkan?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Beralih ke mode Softcore bersifat permanen. Untuk kembali ke mode Hardcore, Anda harus reset game. Lanjutkan?";+"AchievementsMissableAlert" = "Pencapaian ini tidak dapat diperoleh setelah titik tertentu dan memerlukan permainan ulang jika terlewat";+"AchievementsProgressionAlert" = "Pencapaian ini diperlukan untuk menyelesaikan game";+"AchievementsWinAlert" = "Pencapaian ini menandakan game telah diselesaikan";diff --git a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.stringsindex e5f261ab..e087613d 100644--- a/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/it.lproj/Localizable.strings@@ -666,4 +666,7 @@ Premi il pulsante del controller...";"Leaderboard" = "Classifica";"LeaderboardStart" = "Inizio classifica: ";-"TurnOffHardcoreAlert" = "Il passaggio alla modalità Softcore è permanente. Per tornare alla modalità Hardcore, è necessario resettare il gioco. Continuare?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Il passaggio alla modalità Softcore è permanente. Per tornare alla modalità Hardcore, è necessario resettare il gioco. Continuare?";+"AchievementsMissableAlert" = "L'obiettivo non potrà essere ottenuto dopo un certo punto e richiederà un nuovo gioco se perso";+"AchievementsProgressionAlert" = "L'obiettivo è necessario per completare il gioco";+"AchievementsWinAlert" = "L'obiettivo indica che il gioco è stato completato";diff --git a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.stringsindex 48d56dee..a2e68df8 100644--- a/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ja.lproj/Localizable.strings@@ -659,4 +659,7 @@"Leaderboard" = "リーダーボード";"LeaderboardStart" = "リーダーボード開始: ";-"TurnOffHardcoreAlert" = "ソフトコアモードへの切り替えは永久的です。ハードコアモードに戻るにはゲームをリセットする必要があります。続行しますか?";\ No newline at end of file+"TurnOffHardcoreAlert" = "ソフトコアモードへの切り替えは永久的です。ハードコアモードに戻るにはゲームをリセットする必要があります。続行しますか?";+"AchievementsMissableAlert" = "この実績はゲーム進行によっては獲得不能になり、見逃した場合は再プレイが必要です";+"AchievementsProgressionAlert" = "この実績はゲームクリアに必須です";+"AchievementsWinAlert" = "この実績はゲームクリアを意味します";diff --git a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.stringsindex f815b015..15e173b9 100644--- a/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ko.lproj/Localizable.strings@@ -666,4 +666,7 @@"Leaderboard" = "리더보드";"LeaderboardStart" = "리더보드 시작: ";-"TurnOffHardcoreAlert" = "소프트코어 모드 전환은 영구적입니다. 하드코어 모드로 돌아가려면 게임을 재설정해야 합니다. 계속하시겠습니까?";\ No newline at end of file+"TurnOffHardcoreAlert" = "소프트코어 모드 전환은 영구적입니다. 하드코어 모드로 돌아가려면 게임을 재설정해야 합니다. 계속하시겠습니까?";+"AchievementsMissableAlert" = "이 도전 과제는 플레이 도중 특정 시점 이후에는 획득할 수 없으며, 놓칠 경우 다시 플레이해야 합니다";+"AchievementsProgressionAlert" = "이 도전 과제는 게임 클리어에 필수적입니다";+"AchievementsWinAlert" = "이 도전 과제는 게임 클리어를 의미합니다";diff --git a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.stringsindex e7a413ed..edcd9424 100644--- a/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ms.lproj/Localizable.strings@@ -636,4 +636,7 @@ Tekan butang pengawal...";"Leaderboard" = "Papan pemimpin";"LeaderboardStart" = "Mula papan pemimpin: ";-"TurnOffHardcoreAlert" = "Penukaran ke mod Softcore adalah kekal. Untuk kembali ke mod Hardcore, anda mesti menetapkan semula permainan. Teruskan?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Penukaran ke mod Softcore adalah kekal. Untuk kembali ke mod Hardcore, anda mesti menetapkan semula permainan. Teruskan?";+"AchievementsMissableAlert" = "Pencapaian ini tidak boleh diperoleh selepas titik tertentu dan memerlukan permainan semula jika terlepas";+"AchievementsProgressionAlert" = "Pencapaian ini diperlukan untuk menamatkan permainan";+"AchievementsWinAlert" = "Pencapaian ini menandakan permainan telah tamat";diff --git a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.stringsindex a541d194..00dfd2ec 100644--- a/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/nb.lproj/Localizable.strings@@ -654,4 +654,7 @@ Trykk på kontrollerknappen...";"Leaderboard" = "Ledertavle";"LeaderboardStart" = "Ledertavle start: ";-"TurnOffHardcoreAlert" = "Bytting til Softcore-modus er permanent. For å gå tilbake til Hardcore-modus, må du tilbakestille spillet. Fortsette?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Bytting til Softcore-modus er permanent. For å gå tilbake til Hardcore-modus, må du tilbakestille spillet. Fortsette?";+"AchievementsMissableAlert" = "Prestasjonen kan ikke oppnås etter et visst punkt og krever nytt spill hvis misset";+"AchievementsProgressionAlert" = "Prestasjonen er nødvendig for å fullføre spillet";+"AchievementsWinAlert" = "Prestasjonen indikerer at spillet er fullført";diff --git a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.stringsindex 6f63fb85..7be87816 100644--- a/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/nl.lproj/Localizable.strings@@ -663,4 +663,7 @@ Druk op de controllerknop...";"Leaderboard" = "Scorebord";"LeaderboardStart" = "Scorebord start: ";-"TurnOffHardcoreAlert" = "Overschakelen naar de softcore-modus is permanent. Om terug te keren naar de hardcore-modus, moet je het spel resetten. Doorgaan?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Overschakelen naar de softcore-modus is permanent. Om terug te keren naar de hardcore-modus, moet je het spel resetten. Doorgaan?";+"AchievementsMissableAlert" = "De prestatie kan na een bepaald punt niet meer worden verdiend en vereist bij missen een nieuwe speelsessie";+"AchievementsProgressionAlert" = "De prestatie is nodig om het spel uit te spelen";+"AchievementsWinAlert" = "De prestatie geeft aan dat het spel is uitgespeeld";diff --git a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.stringsindex 0a0b1520..9a409ab5 100644--- a/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pl.lproj/Localizable.strings@@ -637,4 +637,7 @@ Naciśnij przycisk kontrolera...";"Leaderboard" = "Tablica wyników";"LeaderboardStart" = "Początek tablicy: ";-"TurnOffHardcoreAlert" = "Przełączenie na tryb Softcore jest trwałe. Aby wrócić do trybu Hardcore, musisz zresetować grę. Kontynuować?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Przełączenie na tryb Softcore jest trwałe. Aby wrócić do trybu Hardcore, musisz zresetować grę. Kontynuować?";+"AchievementsMissableAlert" = "Osiągnięcie nie będzie dostępne po określonym punkcie i wymagać będzie nowej rozgrywki jeśli przegapione";+"AchievementsProgressionAlert" = "Osiągnięcie jest wymagane do ukończenia gry";+"AchievementsWinAlert" = "Osiągnięcie wskazuje, że gra została ukończona";diff --git a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.stringsindex 152c1ba3..673f72d2 100644--- a/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pt-BR.lproj/Localizable.strings@@ -663,4 +663,7 @@ Pressione o botão do controle...";"Leaderboard" = "Ranking";"LeaderboardStart" = "Início do ranking: ";-"TurnOffHardcoreAlert" = "A mudança para o modo Softcore é permanente. Para voltar ao modo Hardcore, você deve reiniciar o jogo. Continuar?";\ No newline at end of file+"TurnOffHardcoreAlert" = "A mudança para o modo Softcore é permanente. Para voltar ao modo Hardcore, você deve reiniciar o jogo. Continuar?";+"AchievementsMissableAlert" = "A conquista não poderá ser obtida após certo ponto do jogo e exigirá nova jogada se perdida";+"AchievementsProgressionAlert" = "A conquista é necessária para finalizar o jogo";+"AchievementsWinAlert" = "A conquista indica que o jogo foi finalizado";diff --git a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.stringsindex 8b3a9877..66357958 100644--- a/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/pt-PT.lproj/Localizable.strings@@ -664,4 +664,7 @@ Pressione o botão do comando...";"Leaderboard" = "Tabela de classificação";"LeaderboardStart" = "Início da tabela: ";-"TurnOffHardcoreAlert" = "A mudança para o modo Softcore é permanente. Para regressar ao modo Hardcore, terá de reiniciar o jogo. Continuar?";\ No newline at end of file+"TurnOffHardcoreAlert" = "A mudança para o modo Softcore é permanente. Para regressar ao modo Hardcore, terá de reiniciar o jogo. Continuar?";+"AchievementsMissableAlert" = "O troféu não poderá ser obtido após determinado ponto e exigirá outra jogada se perdido";+"AchievementsProgressionAlert" = "O troféu é necessário para completar o jogo";+"AchievementsWinAlert" = "O troféu indica que o jogo foi concluído";diff --git a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.stringsindex 9cf0cbe2..ecdfccb2 100644--- a/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ro.lproj/Localizable.strings@@ -662,4 +662,7 @@ Apasă butonul controlerului...";"Leaderboard" = "Clasament";"LeaderboardStart" = "Început clasament: ";-"TurnOffHardcoreAlert" = "Comutarea la modul Softcore este permanentă. Pentru a reveni la modul Hardcore, trebuie să resetezi jocul. Continuați?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Comutarea la modul Softcore este permanentă. Pentru a reveni la modul Hardcore, trebuie să resetezi jocul. Continuați?";+"AchievementsMissableAlert" = "Achievement-ul nu mai poate fi obținut după un anumit punct și necesită un nou joc dacă este ratat";+"AchievementsProgressionAlert" = "Achievement-ul este necesar pentru a termina jocul";+"AchievementsWinAlert" = "Achievement-ul indică faptul că jocul a fost terminat";diff --git a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.stringsindex db10cd4a..5c8f8a3f 100644--- a/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/ru.lproj/Localizable.strings@@ -658,4 +658,7 @@"Leaderboard" = "Таблица лидеров";"LeaderboardStart" = "Начало таблицы: ";-"TurnOffHardcoreAlert" = "Переход на облегченный режим необратим. Для возврата к хардкорному режиму потребуется сбросить игру. Продолжить?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Переход на облегченный режим необратим. Для возврата к хардкорному режиму потребуется сбросить игру. Продолжить?";+"AchievementsMissableAlert" = "Достижение нельзя получить после определенного момента прохождения и потребуется повторная игра при пропуске";+"AchievementsProgressionAlert" = "Достижение необходимо для завершения игры";+"AchievementsWinAlert" = "Достижение указывает на завершение игры";diff --git a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.stringsindex 0f46b895..c157f0e7 100644--- a/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/sk.lproj/Localizable.strings@@ -662,4 +662,7 @@ Ak sa vyskytne nestabilita v 3DS, pozrite si «Časté otázky» alebo sa pripoj"Leaderboard" = "Rebríček";"LeaderboardStart" = "Štart rebríčka: ";-"TurnOffHardcoreAlert" = "Prepnuteie do režimu Softcore je trvalé. Pre návrat do režimu Hardcore musíte hru obnoviť. Pokračovať?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Prepnuteie do režimu Softcore je trvalé. Pre návrat do režimu Hardcore musíte hru obnoviť. Pokračovať?";+"AchievementsMissableAlert" = "Tento úspech nie je možné po určitom bode získat a pri zmeškaní si vyžaduje nové prehratie";+"AchievementsProgressionAlert" = "Tento úspech je potrebný na dokončenie hry";+"AchievementsWinAlert" = "Tento úspech signalizuje, že hra bola dokončená";diff --git a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.stringsindex 26898c9c..4f95a9d4 100644--- a/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/sv.lproj/Localizable.strings@@ -656,4 +656,7 @@ Tryck på kontrollknappen...";"Leaderboard" = "Resultattavla";"LeaderboardStart" = "Resultattavla start: ";-"TurnOffHardcoreAlert" = "Byte till Softcore-läge är permanent. För att återgå till Hardcore-läge måste spelet återställas. Fortsätta?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Byte till Softcore-läge är permanent. För att återgå till Hardcore-läge måste spelet återställas. Fortsätta?";+"AchievementsMissableAlert" = "Prestationen kan inte erhållas efter en viss punkt och kräver en ny spelomgång om missad";+"AchievementsProgressionAlert" = "Prestationen krävs för att klara spelet";+"AchievementsWinAlert" = "Prestationen indikerar att spelet har klarats";diff --git a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.stringsindex c942f3a7..dfa93b5b 100644--- a/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/th.lproj/Localizable.strings@@ -652,4 +652,7 @@"Leaderboard" = "กระดานคะแนน";"LeaderboardStart" = "เริ่มกระดานคะแนน: ";-"TurnOffHardcoreAlert" = "การเปลี่ยนโหมดสมรรถนะต่ำเป็นการถาวร หากต้องการกลับไปโหมดสมรรถนะสูง ต้องรีเซ็ตเกมใหม่ ดำเนินการต่อหรือไม่?";\ No newline at end of file+"TurnOffHardcoreAlert" = "การเปลี่ยนโหมดสมรรถนะต่ำเป็นการถาวร หากต้องการกลับไปโหมดสมรรถนะสูง ต้องรีเซ็ตเกมใหม่ ดำเนินการต่อหรือไม่?";+"AchievementsMissableAlert" = "ความสำเร็จนี้ไม่สามารถได้รับหลังจากจุดหนึ่งในการเล่นและต้องเริ่มเล่นใหม่หากพลาด";+"AchievementsProgressionAlert" = "ความสำเร็จนี้จำเป็นในการผ่านเกม";+"AchievementsWinAlert" = "ความสำเร็จนี้แสดงว่าได้ผ่านเกมแล้ว";diff --git a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.stringsindex 370da3c6..98112e0f 100644--- a/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/tr.lproj/Localizable.strings@@ -662,4 +662,7 @@ Kontrolcü düğmesine basın...";"Leaderboard" = "Liderlik Tablosu";"LeaderboardStart" = "Liderlik başlangıcı: ";-"TurnOffHardcoreAlert" = "Yumuşak moda geçiş kalıcıdır. Hardcore moduna dönmek için oyunu sıfırlamanız gerekir. Devam edilsin mi?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Yumuşak moda geçiş kalıcıdır. Hardcore moduna dönmek için oyunu sıfırlamanız gerekir. Devam edilsin mi?";+"AchievementsMissableAlert" = "Bu başarım oyun içinde belirli bir noktadan sonra kazanılamaz ve kaçırılırsa yeni bir oyun gerektirir";+"AchievementsProgressionAlert" = "Bu başarım oyunu tamamlamak için gereklidir";+"AchievementsWinAlert" = "Bu başarım oyunun tamamlandığını gösterir";diff --git a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.stringsindex 937d22dc..9beee9dd 100644--- a/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/uk.lproj/Localizable.strings@@ -662,4 +662,7 @@"Leaderboard" = "Таблиця лідерів";"LeaderboardStart" = "Початок таблиці лідерів: ";-"TurnOffHardcoreAlert" = "Перехід на режим Softcore є незворотнім. Для повернення до режиму Hardcore потрібно скинути гру. Продовжити?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Перехід на режим Softcore є незворотнім. Для повернення до режиму Hardcore потрібно скинути гру. Продовжити?";+"AchievementsMissableAlert" = "Досягнення не можна отримати після певної точки проходження і вимагатиме повторної гри при пропуску";+"AchievementsProgressionAlert" = "Досягнення необхідне для завершення гри";+"AchievementsWinAlert" = "Досягнення вказує на завершення гри";diff --git a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.stringsindex 6c24eddf..94f7200e 100644--- a/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/vi.lproj/Localizable.strings@@ -656,4 +656,7 @@ Nhấn nút điều khiển...";"Leaderboard" = "Bảng xếp hạng";"LeaderboardStart" = "Bắt đầu bảng xếp hạng: ";-"TurnOffHardcoreAlert" = "Chuyển sang chế độ Softcore là vĩnh viễn. Để quay lại chế độ Hardcore, bạn phải reset game. Tiếp tục?";\ No newline at end of file+"TurnOffHardcoreAlert" = "Chuyển sang chế độ Softcore là vĩnh viễn. Để quay lại chế độ Hardcore, bạn phải reset game. Tiếp tục?";+"AchievementsMissableAlert" = "Thành tích này sẽ không thể đạt được sau một điểm nhất định và yêu cầu chơi lại nếu bỏ lỡ";+"AchievementsProgressionAlert" = "Thành tích này cần thiết để hoàn thành trò chơi";+"AchievementsWinAlert" = "Thành tích này cho biết trò chơi đã được hoàn thành";diff --git a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.stringsindex f6b66d1a..9da6fd9f 100644--- a/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-HK.lproj/Localizable.strings@@ -668,3 +668,7 @@"LeaderboardStart" = "排行榜開始: ";"TurnOffHardcoreAlert" = "切換至休閒模式將無法還原。如需重返硬核模式,必須重置遊戲。是否繼續?";++"AchievementsMissableAlert" = "此成就於遊戲流程中特定時點後將無法獲取,若錯過需重新開始遊戲";+"AchievementsProgressionAlert" = "此成就為通關必要條件";+"AchievementsWinAlert" = "此成就表示遊戲已通關";diff --git a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.stringsindex dee09679..4693ac71 100644--- a/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-Hans.lproj/Localizable.strings@@ -669,3 +669,7 @@"Leaderboard" = "排行榜";"LeaderboardStart" = "排行榜开始:";"TurnOffHardcoreAlert" = "切换到休闲模式后,如需重新开启硬核模式必须重置游戏。是否继续?";++"AchievementsMissableAlert" = "该成就在游戏流程中特定时点后将无法获取,若错过需重新开始游戏";+"AchievementsProgressionAlert" = "该成就是通关的必要条件";+"AchievementsWinAlert" = "该成就表示游戏已通关";diff --git a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.stringsindex 34ed3951..df4659e1 100644--- a/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings+++ b/ManicEmu/ManicEmu/Resources/zh-Hant.lproj/Localizable.strings@@ -668,3 +668,7 @@"LeaderboardStart" = "排行榜開始: ";"TurnOffHardcoreAlert" = "切換至休閒模式將永久生效。如需重返硬核模式,必須重置遊戲。是否繼續?";++"AchievementsMissableAlert" = "此成就於遊戲流程中特定時點後將無法取得,若錯過需重新開始遊戲";+"AchievementsProgressionAlert" = "此成就為通關必要條件";+"AchievementsWinAlert" = "此成就表示遊戲已通關";diff --git a/ManicEmu/ManicEmu/Sources/Base/Constants.swift b/ManicEmu/ManicEmu/Sources/Base/Constants.swiftindex f95c1693..993f00d0 100644--- a/ManicEmu/ManicEmu/Sources/Base/Constants.swift+++ b/ManicEmu/ManicEmu/Sources/Base/Constants.swift@@ -501,9 +501,9 @@ struct Constants {static var JoinQQ: URL {URL(string: "https://pd.qq.com/s/7i1g6jf5k")!}- static var JoinTelegram: URL {- URL(string: "https://t.me/+R56rb3Sa9hM0YjEx")!- }+// static var JoinTelegram: URL {+// URL(string: "https://t.me/+R56rb3Sa9hM0YjEx")!+// }static var JoinDiscord: URL {URL(string: "https://discord.gg/qsaTHzknAZ")!}diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swiftindex 87016810..f761fa3a 100644--- a/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Views/GamesListBlankSlateView.swift@@ -117,7 +117,7 @@ class GamesListBlankSlateView: BaseView {make.trailing.lessThanOrEqualToSuperview().offset(-Constants.Size.ContentSpaceMax)}let channelLinkLabel = UILabel()- let channelName = Locale.prefersCN ? R.string.localizable.qqChannelName() : "Telegram"+ let channelName = Locale.prefersCN ? R.string.localizable.qqChannelName() : "Discord"let matt = NSMutableAttributedString(string: R.string.localizable.importChannelTips(" \(channelName) "), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelPrimary])channelLinkLabel.attributedText = matt.applying(attributes: [.foregroundColor: Constants.Color.Main], toOccurrencesOf: channelName)channelLinkLabel.isUserInteractionEnabled = true@@ -137,7 +137,7 @@ class GamesListBlankSlateView: BaseView {if Locale.prefersCN {UIApplication.shared.open(Constants.URLs.JoinQQ)} else {- UIApplication.shared.open(Constants.URLs.JoinTelegram)+ UIApplication.shared.open(Constants.URLs.JoinDiscord)}}diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFooterCollectionReusableView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFooterCollectionReusableView.swiftindex c8ad92df..67eefb9c 100644--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFooterCollectionReusableView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportFooterCollectionReusableView.swift@@ -82,7 +82,7 @@ class ImportFooterCollectionReusableView: UICollectionReusableView {make.leading.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceMid)make.centerY.equalToSuperview()}- let channelName = Locale.prefersCN ? R.string.localizable.qqChannelName() : "Telegram"+ let channelName = Locale.prefersCN ? R.string.localizable.qqChannelName() : "Discord"let matt2 = NSMutableAttributedString(string: R.string.localizable.importChannelTips(" \(channelName) "), attributes: [.font: Constants.Font.caption(size: .l), .foregroundColor: Constants.Color.LabelPrimary])channelLinkLabel.attributedText = matt2.applying(attributes: [.foregroundColor: Constants.Color.Main], toOccurrencesOf: channelName)}diff --git a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swiftindex 95faf20e..833a1d4d 100644--- a/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Import/Views/ImportServiceListView.swift@@ -303,7 +303,7 @@ extension ImportServiceListView: UICollectionViewDataSource {if Locale.prefersCN {UIApplication.shared.open(Constants.URLs.JoinQQ)} else {- UIApplication.shared.open(Constants.URLs.JoinTelegram)+ UIApplication.shared.open(Constants.URLs.JoinDiscord)}}return footerdiff --git a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swiftindex 6c9bb0dd..96d7e41f 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/Models/Game.swift@@ -144,11 +144,7 @@ class Game: Object, ObjectUpdatable {} else if gameType == .nes {return URL(fileURLWithPath: Constants.Path.Nestopia.appendingPathComponent("\(name).srm"))} else if gameType == .snes {- if defaultCore == 0 {- return URL(fileURLWithPath: Constants.Path.bsnes.appendingPathComponent("\(name).srm"))- } else {- return URL(fileURLWithPath: Constants.Path.Snes9x.appendingPathComponent("\(name).srm"))- }+ return URL(fileURLWithPath: Constants.Path.bsnes.appendingPathComponent("\(name).srm"))} else if isPicodriveCore {return URL(fileURLWithPath: Constants.Path.PicoDrive.appendingPathComponent("\(name).srm"))} else if gameType == .n64 {@@ -299,11 +295,7 @@ class Game: Object, ObjectUpdatable {} else if gameType == .nes {return Bundle.main.path(forResource: "nestopia.libretro", ofType: "framework", inDirectory: "Frameworks")} else if gameType == .snes {- if defaultCore == 0 {- return Bundle.main.path(forResource: "bsnes.libretro", ofType: "framework", inDirectory: "Frameworks")- } else {- return Bundle.main.path(forResource: "snes9x.libretro", ofType: "framework", inDirectory: "Frameworks")- }+ return Bundle.main.path(forResource: "bsnes.libretro", ofType: "framework", inDirectory: "Frameworks")} else if isPicodriveCore {return Bundle.main.path(forResource: "picodrive.libretro", ofType: "framework", inDirectory: "Frameworks")} else if gameType == .ss {diff --git a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swiftindex 452ac553..0184b5b5 100644--- a/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Play/VIewControllers/PlayViewController.swift@@ -251,10 +251,6 @@ class PlayViewController: GameViewController {}, hideAction: {UserDefaults.standard.set(true, forKey: Constants.DefaultKey.HasShowSSPlayAlert)});- } else if game.gameType == .snes, game.defaultCore != 0 {- UIView.makeAlert(detail: R.string.localizable.snes9xAlert(), cancelTitle: R.string.localizable.gotIt(), hideAction: {- showPlayView()- })} else {showPlayView()}@@ -1898,12 +1894,7 @@ extension PlayViewController {} else if manicGame.gameType == .nes {LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Nestopia.name, key: "nestopia_aspect", value: "uncorrected", reload: false)} else if manicGame.gameType == .snes {- if manicGame.defaultCore == 0 {- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.bsnes.name, key: "bsnes_ppu_no_vram_blocking", value: "ON", reload: false)- } else {- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Snes9x.name, key: "snes9x_aspect", value: "uncorrected", reload: false)- LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.Snes9x.name, key: "snes9x_block_invalid_vram_access", value: "disabled", reload: false)- }+ LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.bsnes.name, key: "bsnes_ppu_no_vram_blocking", value: "ON", reload: false)} else if manicGame.isPicodriveCore {LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.PicoDrive.name, key: "picodrive_input1", value: "6 button pad", reload: false)LibretroCore.sharedInstance().updateConfig(LibretroCore.Cores.PicoDrive.name, key: "picodrive_input2", value: "6 button pad", reload: false)diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swiftindex 9a15cd37..f8cd54a2 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsDetailView.swift@@ -20,6 +20,35 @@ class RetroAchievementsDetailView: BaseView {}coverImageView.kf.setImage(with: URL(string: achievement.unlocked ? achievement.unlockedBadgeUrl : achievement.activeBadgeUrl), placeholder: UIImage.placeHolder(preferenceSize: .init(160)))+ var iconSymbol: SFSymbol? = nil+ var iconAlert: String? = nil+ if achievement.isMissable && achievement.isProgression {+ iconSymbol = .starCircle+ iconAlert = R.string.localizable.achievementsWinAlert()+ } else if achievement.isMissable {+ iconSymbol = .exclamationmarkCircle+ iconAlert = R.string.localizable.achievementsMissableAlert()+ } else if achievement.isProgression {+ iconSymbol = .clockBadgeCheckmark+ iconAlert = R.string.localizable.achievementsProgressionAlert()+ }+ if let iconSymbol {+ let iconImageView = SymbolButton(image: UIImage(symbol: iconSymbol, color: .white))+ iconImageView.enableRoundCorner = true+ iconImageView.backgroundColor = UIColor.black+ addSubview(iconImageView)+ iconImageView.snp.makeConstraints { make in+ make.top.trailing.equalTo(coverImageView).inset(Constants.Size.ContentSpaceTiny)+ make.size.equalTo(20)+ }+ iconImageView.addTapGesture { gesture in+ if let iconAlert {+ UIView.makeAlert(detail: iconAlert)+ }+ }+ }++let titleLabel: UILabel = {let view = UILabel()view.numberOfLines = 0@@ -39,12 +68,40 @@ class RetroAchievementsDetailView: BaseView {make.top.equalTo(coverImageView.snp.bottom).offset(Constants.Size.ContentSpaceHuge)}+ var enableProgressView: RetroAchievementsListCell.AchievementsProgressView? = nil+ if let measuredProgress = achievement.measuredProgress, !measuredProgress.isEmpty {+ let progressView = RetroAchievementsListCell.AchievementsProgressView()+ enableProgressView = progressView+ progressView.progress = achievement.measuredPercent+ addSubview(progressView)+ progressView.snp.makeConstraints { make in+ make.leading.equalTo(titleLabel)+ make.height.equalTo(2)+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceMid)+ }++ let progressLabel = UILabel()+ progressLabel.font = Constants.Font.body()+ progressLabel.textColor = Constants.Color.Yellow+ progressLabel.text = measuredProgress+ addSubview(progressLabel)+ progressLabel.snp.makeConstraints { make in+ make.leading.equalTo(progressView.snp.trailing).offset(Constants.Size.ContentSpaceTiny)+ make.centerY.equalTo(progressView)+ make.trailing.equalTo(titleLabel)+ }+ }+let seperator = SparkleSeperatorView(color: Constants.Color.BackgroundTertiary, lineColor: Constants.Color.BackgroundSecondary)addSubview(seperator)seperator.snp.makeConstraints { make inmake.leading.trailing.equalToSuperview()make.height.equalTo(24)- make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceHuge)+ if let enableProgressView {+ make.top.equalTo(enableProgressView.snp.bottom).offset(Constants.Size.ContentSpaceHuge)+ } else {+ make.top.equalTo(titleLabel.snp.bottom).offset(Constants.Size.ContentSpaceHuge)+ }}let infoLabel: UILabel = {@@ -66,7 +123,7 @@ class RetroAchievementsDetailView: BaseView {make.centerX.equalToSuperview()make.leading.greaterThanOrEqualToSuperview()make.trailing.lessThanOrEqualToSuperview()- make.top.equalTo(seperator.snp.bottom).offset(Constants.Size.ContentSpaceHuge)+ make.top.equalTo(seperator.snp.bottom).offset(Constants.Size.ContentSpaceMax)}let roundContainer = RoundAndBorderView(roundCorner: .allCorners, borderColor: UIColor.white.withAlphaComponent(0.1), borderWidth: 2)@@ -79,7 +136,12 @@ class RetroAchievementsDetailView: BaseView {roundContainer.snp.makeConstraints { make inmake.height.equalTo(Constants.Size.ItemHeightMid)make.centerX.equalToSuperview()- make.top.equalTo(infoLabel.snp.bottom).offset(Constants.Size.ItemHeightMax)+ if let _ = enableProgressView {+ make.top.equalTo(infoLabel.snp.bottom).offset(Constants.Size.ItemHeightUltraTiny)+ } else {+ make.top.equalTo(infoLabel.snp.bottom).offset(Constants.Size.ItemHeightMin)+ }+make.bottom.equalToSuperview()}let okLabel = UILabel()diff --git a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swiftindex 04de69d7..e6cc26a2 100644--- a/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift+++ b/ManicEmu/ManicEmu/Sources/Business/RetroAchievements/Views/RetroAchievementsListCell.swift@@ -38,6 +38,14 @@ class RetroAchievementsListCell: UICollectionViewCell {return view}()+ private let winImageView: SymbolButton = {+ let view = SymbolButton(image: UIImage(symbol: .starCircle, font: Constants.Font.caption(size: .l), color: .white))+ view.enableRoundCorner = true+ view.backgroundColor = .black+ view.isHidden = true+ return view+ }()+override init(frame: CGRect) {super.init(frame: frame)addSubview(imageView)@@ -56,6 +64,12 @@ class RetroAchievementsListCell: UICollectionViewCell {make.top.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceUltraTiny)make.size.equalTo(15)}++ imageView.addSubview(winImageView)+ winImageView.snp.makeConstraints { make in+ make.top.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceUltraTiny)+ make.size.equalTo(15)+ }}required init?(coder: NSCoder) {@@ -79,22 +93,20 @@ class RetroAchievementsListCell: UICollectionViewCell {}imageView.kf.setImage(with: URL(string: url), placeholder: UIImage.placeHolder(preferenceSize: .init(64)))if achievement.isMissable && achievement.isProgression {- missableImageView.snp.updateConstraints { make in- make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceUltraTiny * 2 + 13)- }- missableImageView.isHidden = false- progressionImageView.isHidden = false+ winImageView.isHidden = false+ missableImageView.isHidden = true+ progressionImageView.isHidden = true} else {- missableImageView.snp.updateConstraints { make in- make.trailing.equalToSuperview().inset(Constants.Size.ContentSpaceUltraTiny)- }if achievement.isMissable {+ winImageView.isHidden = truemissableImageView.isHidden = falseprogressionImageView.isHidden = true} else if achievement.isProgression {+ winImageView.isHidden = truemissableImageView.isHidden = trueprogressionImageView.isHidden = false} else {+ winImageView.isHidden = truemissableImageView.isHidden = trueprogressionImageView.isHidden = true}diff --git a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swiftindex 87b77b9e..d4771397 100644--- a/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Settings/Views/SettingsListView.swift@@ -128,7 +128,6 @@ class SettingsListView: BaseView {datas[section] = [SettingItem(type: .FAQ),SettingItem(type: .feedback),SettingItem(type: .qq),- SettingItem(type: .telegram),SettingItem(type: .discord)]} else if section == .others {datas[section] = [SettingItem(type: .about),@@ -484,8 +483,6 @@ extension SettingsListView: UICollectionViewDelegate {ShareManager.shareApp(senderForIpad: UIDevice.isPad ? (collectionView.cellForItem(at: indexPath) ?? collectionView) : nil)case .qq:UIApplication.shared.open(Constants.URLs.JoinQQ)- case .telegram:- UIApplication.shared.open(Constants.URLs.JoinTelegram)case .discord:UIApplication.shared.open(Constants.URLs.JoinDiscord)case .clearCache:diff --git a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swiftindex 6aad560b..e7bf9b48 100644--- a/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift+++ b/ManicEmu/ManicEmu/Sources/Tools/Extensions/GameTypeExtensions.swift@@ -266,8 +266,6 @@ extension GameType {var supportCores: [String] {if self == .ss {return [LibretroCore.Cores.BeetleSaturn.name, LibretroCore.Cores.Yabause.name]- } else if self == .snes {- return [LibretroCore.Cores.bsnes.name, LibretroCore.Cores.Snes9x.name]} else if self == .gba {return [LibretroCore.Cores.mGBA.name, LibretroCore.Cores.VBAM.name]}diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swiftindex d1388032..9c5f357f 100644--- a/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/Database.swift@@ -242,7 +242,7 @@ struct Database {if games.count > 0 {try? realm.write({for g in games {- if g.gameSaveStates.count > 0 {+ if g.gameType == .gba, g.gameSaveStates.count > 0 {g.defaultCore = 1} else if g.gameType == .snes {//如果将snes游戏迁移至bsnes 则将存档文件从Snes9x迁移到bsnes@@ -254,9 +254,9 @@ struct Database {}})- //将存档文件都进行核心标记+ //将GBA即时存档文件都进行核心标记for g in games {- if g.gameSaveStates.count > 0 {+ if g.gameType == .gba, g.gameSaveStates.count > 0 {for s in g.gameSaveStates {s.updateExtra(key: ExtraKey.saveStateCore.rawValue, value: 1)}