diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | VERSION.yaml | 6 | ||||
| -rwxr-xr-x | assets/areas.yaml | 2 | ||||
| -rw-r--r-- | src/ap_state.cpp | 4 | ||||
| -rw-r--r-- | src/game_data.cpp | 4 | ||||
| -rw-r--r-- | src/game_data.h | 1 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/tracker_state.cpp | 7 | ||||
| -rw-r--r-- | src/updater.cpp | 2 | ||||
| -rw-r--r-- | src/version.h | 2 |
11 files changed, 28 insertions, 12 deletions
| diff --git a/CHANGELOG.md b/CHANGELOG.md index 35bd8ec..e2444b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | # lingo-ap-tracker Releases | 1 | # lingo-ap-tracker Releases |
| 2 | 2 | ||
| 3 | ## v2.0.2 - 2025-05-24 | ||
| 4 | |||
| 5 | - Fixed issue connecting to the Archipelago 0.6.2 RC server. | ||
| 6 | |||
| 7 | Download: | ||
| 8 | [lingo-ap-tracker-v2.0.2-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.2-win64.zip)<br/> | ||
| 9 | Source: [v2.0.2](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v2.0.2) | ||
| 10 | |||
| 3 | ## v2.0.1 - 2025-04-06 | 11 | ## v2.0.1 - 2025-04-06 |
| 4 | 12 | ||
| 5 | - The tracker now assumes postgame shuffle is enabled when the flag is not | 13 | - The tracker now assumes postgame shuffle is enabled when the flag is not |
| diff --git a/VERSION b/VERSION index 81ef58f..b02d37b 100644 --- a/VERSION +++ b/VERSION | |||
| @@ -1 +1 @@ | |||
| v2.0.1 \ No newline at end of file | v2.0.2 \ No newline at end of file | ||
| diff --git a/VERSION.yaml b/VERSION.yaml index 9e33b26..8f86a39 100644 --- a/VERSION.yaml +++ b/VERSION.yaml | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | version: v2.0.1 | 1 | version: v2.0.2 |
| 2 | packages: | 2 | packages: |
| 3 | win64: | 3 | win64: |
| 4 | url: "https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.1-win64.zip" | 4 | url: "https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.2-win64.zip" |
| 5 | checksum: "4e467014f6f18ae413f396e1eb052e29608e25e4264646f07bbd421671a851c3" | 5 | checksum: "dfb2fce2f5b14c09f4af7e7fcf6478e420a070db9fb23f9f9ad196f2db4b7518" |
| 6 | files: | 6 | files: |
| 7 | - fmt.dll | 7 | - fmt.dll |
| 8 | - jpeg62.dll | 8 | - jpeg62.dll |
| diff --git a/assets/areas.yaml b/assets/areas.yaml index cbcf23a..a615e2c 100755 --- a/assets/areas.yaml +++ b/assets/areas.yaml | |||
| @@ -279,6 +279,8 @@ | |||
| 279 | map: [1368, 2103] | 279 | map: [1368, 2103] |
| 280 | Art Gallery: | 280 | Art Gallery: |
| 281 | map: [2474, 1366] | 281 | map: [2474, 1366] |
| 282 | Art Gallery (First Floor): | ||
| 283 | fold_into: Art Gallery | ||
| 282 | Art Gallery (Second Floor): | 284 | Art Gallery (Second Floor): |
| 283 | fold_into: Art Gallery | 285 | fold_into: Art Gallery |
| 284 | Art Gallery (Third Floor): | 286 | Art Gallery (Third Floor): |
| diff --git a/src/ap_state.cpp b/src/ap_state.cpp index dfb8fe7..8438649 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp | |||
| @@ -29,8 +29,8 @@ | |||
| 29 | #include "tracker_state.h" | 29 | #include "tracker_state.h" |
| 30 | 30 | ||
| 31 | constexpr int AP_MAJOR = 0; | 31 | constexpr int AP_MAJOR = 0; |
| 32 | constexpr int AP_MINOR = 4; | 32 | constexpr int AP_MINOR = 6; |
| 33 | constexpr int AP_REVISION = 5; | 33 | constexpr int AP_REVISION = 1; |
| 34 | 34 | ||
| 35 | constexpr const char* CERT_STORE_PATH = "cacert.pem"; | 35 | constexpr const char* CERT_STORE_PATH = "cacert.pem"; |
| 36 | constexpr int ITEM_HANDLING = 7; // <- all | 36 | constexpr int ITEM_HANDLING = 7; // <- all |
| diff --git a/src/game_data.cpp b/src/game_data.cpp index 94b9888..588ffc8 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp | |||
| @@ -127,6 +127,10 @@ struct GameData { | |||
| 127 | exit_obj.type = EntranceType::kCrossroadsRoofAccess; | 127 | exit_obj.type = EntranceType::kCrossroadsRoofAccess; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | if (option["static_painting"] && option["static_painting"].as<bool>()) { | ||
| 131 | exit_obj.type = EntranceType::kStaticPainting; | ||
| 132 | } | ||
| 133 | |||
| 130 | rooms_[from_room_id].exits.push_back(exit_obj); | 134 | rooms_[from_room_id].exits.push_back(exit_obj); |
| 131 | }; | 135 | }; |
| 132 | 136 | ||
| diff --git a/src/game_data.h b/src/game_data.h index ac911e5..8d3db4b 100644 --- a/src/game_data.h +++ b/src/game_data.h | |||
| @@ -31,6 +31,7 @@ enum class EntranceType { | |||
| 31 | kWarp, | 31 | kWarp, |
| 32 | kPilgrimage, | 32 | kPilgrimage, |
| 33 | kCrossroadsRoofAccess, | 33 | kCrossroadsRoofAccess, |
| 34 | kStaticPainting, | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | enum class DoorType { | 37 | enum class DoorType { |
| diff --git a/src/main.cpp b/src/main.cpp index 1d7cc9e..574b6df 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | class TrackerApp : public wxApp { | 11 | class TrackerApp : public wxApp { |
| 12 | public: | 12 | public: |
| 13 | virtual bool OnInit() { | 13 | virtual bool OnInit() override { |
| 14 | GetTrackerConfig().Load(); | 14 | GetTrackerConfig().Load(); |
| 15 | 15 | ||
| 16 | TrackerFrame *frame = new TrackerFrame(); | 16 | TrackerFrame *frame = new TrackerFrame(); |
| diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index bf2725a..674f68a 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp | |||
| @@ -342,7 +342,7 @@ class StateCalculator { | |||
| 342 | new_boundary.push_back( | 342 | new_boundary.push_back( |
| 343 | {.source_room = room_exit.destination_room, | 343 | {.source_room = room_exit.destination_room, |
| 344 | .destination_room = GD_GetRoomByName("Color Hallways"), | 344 | .destination_room = GD_GetRoomByName("Color Hallways"), |
| 345 | .type = EntranceType::kPainting}); | 345 | .type = EntranceType::kStaticPainting}); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | if (AP_IsPilgrimageEnabled()) { | 348 | if (AP_IsPilgrimageEnabled()) { |
| @@ -368,7 +368,7 @@ class StateCalculator { | |||
| 368 | .destination_room = GD_GetRoomByName("Pilgrim Antechamber"), | 368 | .destination_room = GD_GetRoomByName("Pilgrim Antechamber"), |
| 369 | .door = | 369 | .door = |
| 370 | GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"), | 370 | GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"), |
| 371 | .type = EntranceType::kPainting}); | 371 | .type = EntranceType::kStaticPainting}); |
| 372 | } | 372 | } |
| 373 | } | 373 | } |
| 374 | 374 | ||
| @@ -650,7 +650,8 @@ class StateCalculator { | |||
| 650 | !AP_DoesPilgrimageAllowRoofAccess()) { | 650 | !AP_DoesPilgrimageAllowRoofAccess()) { |
| 651 | return kNo; | 651 | return kNo; |
| 652 | } | 652 | } |
| 653 | if (room_exit.type == EntranceType::kPainting && | 653 | if ((room_exit.type == EntranceType::kPainting || |
| 654 | room_exit.type == EntranceType::kStaticPainting) && | ||
| 654 | !AP_DoesPilgrimageAllowPaintings()) { | 655 | !AP_DoesPilgrimageAllowPaintings()) { |
| 655 | return kNo; | 656 | return kNo; |
| 656 | } | 657 | } |
| diff --git a/src/updater.cpp b/src/updater.cpp index 773f7d3..2b05daf 100644 --- a/src/updater.cpp +++ b/src/updater.cpp | |||
| @@ -36,7 +36,7 @@ std::string CalculateStringSha256(const wxString& data) { | |||
| 36 | 36 | ||
| 37 | char output[65] = {0}; | 37 | char output[65] = {0}; |
| 38 | for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) { | 38 | for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) { |
| 39 | sprintf(output + (i * 2), "%02x", hash[i]); | 39 | snprintf(output + (i * 2), 3, "%02x", hash[i]); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | return std::string(output); | 42 | return std::string(output); |
| diff --git a/src/version.h b/src/version.h index fe31a6e..3439fda 100644 --- a/src/version.h +++ b/src/version.h | |||
| @@ -36,6 +36,6 @@ struct Version { | |||
| 36 | } | 36 | } |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | constexpr const Version kTrackerVersion = Version(2, 0, 1); | 39 | constexpr const Version kTrackerVersion = Version(2, 0, 2); |
| 40 | 40 | ||
| 41 | #endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file | 41 | #endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file |
