Skip to content

Commit 5dd24f2

Browse files
committed
[v0.9.527] Organized credits for official templates in README.md file. Added a simple progress counter to the automatic updating popups. Made the "Track Active Instance" setting default.
1 parent 7fbbb98 commit 5dd24f2

File tree

8 files changed

+16
-13
lines changed

8 files changed

+16
-13
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,11 @@ _The `test1` templates are for you to learn and understand how templates work. T
695695
functionalities of all goal types. The `Default` language is the standard english template (`_lang.json`). Any
696696
non-default languages are appended after `lang_`._
697697

698-
Credits for the `zh_cn` (chinese) translation of the `all_advancements` templates go to @towardstars and @yumekotism on
699-
dc.
700-
Make sure you use the `SourceHanSansCN-Normal.otf` font in all places (tracker, overlay and UI).
698+
Credits to creators of templates):
699+
- @towardstars and @yumekotism on dc: `zh_cn` translations for `all_advancements` templates. _Make sure you use the `SourceHanSansCN-Normal.otf` font in all places (tracker, overlay and UI)._
700+
- [MoreTrident](https://www.twitch.tv/moretrident): `all_trims` template.
701+
702+
_(Submit your template through the [official discord](https://discord.gg/TyNgXDz)._
701703
</details>
702704

703705
***

resources/config/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"scrollable_list_threshold": 16,
173173
"tracker_list_scroll_speed": 36
174174
},
175-
"path_mode": "auto",
175+
"path_mode": "instance",
176176
"manual_saves_path": "",
177177
"version": "1.16.1",
178178
"display_version": "1.16.1",
152 Bytes
Loading

resources/reference_files/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"scrollable_list_threshold": 16,
173173
"tracker_list_scroll_speed": 36
174174
},
175-
"path_mode": "auto",
175+
"path_mode": "instance",
176176
"manual_saves_path": "",
177177
"version": "1.16.1",
178178
"display_version": "1.16.1",

source/main.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,11 +1112,11 @@ int main(int argc, char *argv[]) {
11121112
}
11131113

11141114
// User clicked "Install Update"
1115-
show_error_message("Downloading Update",
1115+
show_error_message("Step 1/3: Downloading Update",
11161116
"Downloading the latest version,\nplease wait after clicking \"OK\"...");
11171117

11181118
if (download_update_zip(download_url)) {
1119-
show_error_message("Download Complete",
1119+
show_error_message("Step 2/3: Download Complete",
11201120
"Update downloaded.\nExtracting files after clicking \"OK\"...");
11211121

11221122
mz_zip_archive zip_archive;
@@ -1167,7 +1167,7 @@ int main(int argc, char *argv[]) {
11671167
// Now that files are extracted, apply the update
11681168
char exe_path[MAX_PATH_LENGTH];
11691169
if (get_executable_path(exe_path, sizeof(exe_path))) {
1170-
show_error_message("Update Ready",
1170+
show_error_message("Step 3/3: Update Ready",
11711171
"Advancely will now close to apply the update and then restart automatically.\nClick \"OK\" to continue.");
11721172
if (apply_update(exe_path)) {
11731173
// The updater script has been launched.
@@ -1559,7 +1559,8 @@ int main(int argc, char *argv[]) {
15591559
if (get_saves_path(detected_path, MAX_PATH_LENGTH, PATH_MODE_INSTANCE, nullptr)) {
15601560
// If it differs from what we are currently watching
15611561
if (strcmp(detected_path, tracker->saves_path) != 0) {
1562-
log_message(LOG_INFO, "[MAIN] Active instance switch detected.\nOld: %s\nNew: %s\n", tracker->saves_path, detected_path);
1562+
log_message(LOG_INFO, "[MAIN] Active instance switch detected.\nOld: %s\nNew: %s\n",
1563+
tracker->saves_path, detected_path);
15631564

15641565
// Trigger the existing settings-changed workflow.
15651566
// This safely de-inits dmon, re-inits paths, and reloads the template.

source/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const char* get_notes_manifest_path();
5555
#define TRACKER_TITLE "Advancely"
5656

5757
// This is the version that gets compared with the latest release tag on GitHub
58-
#define ADVANCELY_VERSION "v0.9.526" // vMAJOR.MINOR.PATCH // Update this always, SAME FORMAT ON RELEASE TAG!
58+
#define ADVANCELY_VERSION "v0.9.527" // vMAJOR.MINOR.PATCH // Update this always, SAME FORMAT ON RELEASE TAG!
5959
#define ADVANCELY_ICON_PATH "/gui/Advancely_Logo_NoText.png" // Starting from /gui folder
6060
#define ADVANCELY_LOGO_PATH "/gui/Advancely_Logo.png" // Starting from /gui folder
6161
#define ADVANCELY_LOGO_SIZE 512.0f // Logo size on startup message window or update successful window

source/settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ void settings_render_gui(bool *p_open, AppSettings *app_settings, ImFont *roboto
22662266
"Resets all settings (besides window size/position & hotkeys) in this window to their default values.\n"
22672267
"This does not modify your template files.\n\n"
22682268
"Defaults:\n"
2269-
" - Path Mode: Auto-Detect Default Saves Path\n"
2269+
" - Path Mode: Track Active Instance\n"
22702270
" - Template/Display Version: %s\n"
22712271
" - StatsPerWorld Mod (Legacy): %s\n"
22722272
" - Category: %s, Optional Flag: %s, Display Category: %s, Language: Default\n"

source/settings_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void settings_set_defaults(AppSettings *settings) {
272272
strncpy(settings->display_version_str, DEFAULT_VERSION, sizeof(settings->display_version_str) - 1);
273273
settings->display_version_str[sizeof(settings->display_version_str) - 1] = '\0';
274274

275-
settings->path_mode = PATH_MODE_AUTO;
275+
settings->path_mode = PATH_MODE_INSTANCE;
276276
settings->manual_saves_path[0] = '\0';
277277
strncpy(settings->category, DEFAULT_CATEGORY, sizeof(settings->category) - 1);
278278
settings->category[sizeof(settings->category) - 1] = '\0';
@@ -417,7 +417,7 @@ bool settings_load(AppSettings *settings) {
417417
settings->path_mode = settings_get_path_mode_from_string(
418418
path_mode_json->valuestring);
419419
else {
420-
settings->path_mode = PATH_MODE_AUTO;
420+
settings->path_mode = PATH_MODE_INSTANCE; // Default to instance mode
421421
defaults_were_used = true;
422422
}
423423

0 commit comments

Comments
 (0)