Merge branch 'zoffline:master' into master

oldnapalm · Aug 26, 2024 · f37efde · f37efde
2 parents 4f2720e + d9c0071
commit f37efde
Show file tree

Hide file tree

Showing 9 changed files with 590 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -96,10 +96,10 @@ zoffline can be installed on the same machine as Zwift or another local machine.
 <details><summary>Windows Instructions</summary>
 
 * Install Zwift
-  * If your Zwift version is 1.0.134206, you're all set.
+  * If your Zwift version is 1.0.134595, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.134206 and zoffline is running from source: copy ``C:\Program Files (x86)\Zwift\Zwift_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
-  * If your Zwift version is newer than 1.0.134206 and zoffline is not running from source: wait for zoffline to be updated.
+  * If your Zwift version is newer than 1.0.134595 and zoffline is running from source: copy ``C:\Program Files (x86)\Zwift\Zwift_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
+  * If your Zwift version is newer than 1.0.134595 and zoffline is not running from source: wait for zoffline to be updated.
 * __NOTE:__ instead of performing the steps below you can instead just run the __configure_client__ script from https://github.com/oldnapalm/zoffline-helper/releases/latest
 * On your Windows machine running Zwift, copy the following files in this repo to a known location:
   * [ssl/cert-zwift-com.p12](https://github.com/zoffline/zwift-offline/raw/master/ssl/cert-zwift-com.p12)
@@ -124,9 +124,9 @@ to generate your own certificates and do the same.
 <details><summary>macOS Instructions</summary>
 
 * Install Zwift
-  * If your Zwift version is 1.0.134206, you're all set.
+  * If your Zwift version is 1.0.134595, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.134206: copy ``~/Library/Application Support/Zwift/ZwiftMac_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
+  * If your Zwift version is newer than 1.0.134595: copy ``~/Library/Application Support/Zwift/ZwiftMac_ver_cur.xml`` to zoffline's ``cdn/gameassets/Zwift_Updates_Root/`` overwriting the existing file.
 * On your Mac machine running Zwift, copy the file [ssl/cert-zwift-com.pem](https://github.com/zoffline/zwift-offline/raw/master/ssl/cert-zwift-com.pem) in this repo to a known location.
 * Open Keychain Access, select "System" under "Keychains", select "Certificates" under "Category"
     * Click "File - Import Items..." and import cert-zwift-com.pem
@@ -342,6 +342,15 @@ To enable support for multiple users perform the steps below:
   * If multiplayer is enabled, access ``https://<zoffline_ip>/login/``, check "Enable ghosts" and click "Start Zwift" to save the option.
 * When you save an activity, the ghost will be saved in ``storage/<player_id>/ghosts/<world>/<route>``. Next time you ride the same route, the ghost will be loaded.
 * Type ``.regroup`` in chat to regroup the ghosts.
+* Equipment ("bike_frame", "bike_wheel_front", "bike_wheel_rear", "ride_jersey", "ride_helmet_type", "glasses_type", "ride_shoes_type" and "ride_socks_type") can be customized by creating a file ``ghost_profile.txt`` inside the ``storage`` folder. Values (signature) can be found in [GameDictionary](http://cdn.zwift.com/gameassets/GameDictionary.xml).
+
+  Example:
+  ``` json
+  {
+    "ride_jersey": 90433914,
+    "bike_frame": 1456463855
+  }
+  ```
 
 #### Bots
 

diff --git a/cdn/gameassets/Zwift_Updates_Root/ZwiftMac_ver_cur.xml b/cdn/gameassets/Zwift_Updates_Root/ZwiftMac_ver_cur.xml
@@ -1 +1 @@
-<Zwift version="1.0.134206" sversion="1.72.0 (134206)" gbranch="rc/1.72.0" gcommit="979f0b9931044e65f899380922dfad3c7294dde6" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.134206_83b1854b_manifest.xml" manifest_checksum="1712272006" ver_cur_checksum="-410340402"/>
+<Zwift version="1.0.134595" sversion="1.72.2 (134595)" gbranch="rc/1.72.2" gcommit="451573555ef11709e60461ac84f368a122f14ddc" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.134595_ce35793d_manifest.xml" manifest_checksum="-1057907904" ver_cur_checksum="-1100226285"/>
diff --git a/cdn/gameassets/Zwift_Updates_Root/Zwift_ver_cur.xml b/cdn/gameassets/Zwift_Updates_Root/Zwift_ver_cur.xml
@@ -1 +1 @@
-<Zwift version="1.0.134206" sversion="1.72.0 (134206)" gbranch="rc/1.72.0" gcommit="979f0b9931044e65f899380922dfad3c7294dde6" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.134206_83b1854b_manifest.xml" manifest_checksum="1749151736" ver_cur_checksum="123125889"/>
+<Zwift version="1.0.134595" sversion="1.72.2 (134595)" gbranch="rc/1.72.2" gcommit="451573555ef11709e60461ac84f368a122f14ddc" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.134595_ce35793d_manifest.xml" manifest_checksum="-1185758442" ver_cur_checksum="-390452429"/>
diff --git a/data/game_dictionary.txt b/data/game_dictionary.txt
@@ -54,6 +54,7 @@
     1498204581,
     1609128200,
     1684913570,
+    1689510425,
     1713458564,
     1716963782,
     1720452859,
@@ -180,6 +181,7 @@
     560768614,
     725344338,
     1039719545,
+    1239918577,
     1335895262,
     1424136009,
     1614109799,
@@ -223,6 +225,7 @@
     657449117,
     690995707,
     708573979,
+    776931720,
     805406818,
     853522319,
     861674422,
@@ -524,6 +527,7 @@
     715624988,
     716189513,
     728048032,
+    728596447,
     732880966,
     733758360,
     750929824,
@@ -768,6 +772,7 @@
     1769311524,
     1769856110,
     1771577861,
+    1775021494,
     1776034995,
     1801600368,
     1802089334,
@@ -826,6 +831,7 @@
     2018309551,
     2021712776,
     2027807142,
+    2033775520,
     2049543282,
     2050061293,
     2050259031,
@@ -1635,6 +1641,7 @@
     1531810507,
     1538925592,
     1539153651,
+    1556464651,
     1598044512,
     1636252940,
     1641296782,
@@ -1759,6 +1766,7 @@
     200937232,
     202263616,
     213931599,
+    236152884,
     240919495,
     315747548,
     320106855,
@@ -1888,6 +1896,7 @@
     3055713810,
     3086387372,
     3303617268,
+    3371909522,
     3413023141,
     3589642520,
     3662000114,
@@ -1957,6 +1966,7 @@
     "1874220070": "Moots MootsVamoots2021",
     "1928137471": "Trek Emonda SL",
     "1936733870": "Chapter2 Chapter2KOKO2022",
+    "1950596038": "Pinarello DogmaF2024",
     "1972610461": "Cervelo CerveloS52021",
     "2002850191": "Scott ScottPlasma2022",
     "2005280203": "Cannondale System Six",
@@ -2213,7 +2223,8 @@
     "257": 3166535632,
     "258": 3878295865,
     "259": 3351665212,
-    "260": 1384155764
+    "260": 1384155764,
+    "261": 54700404
   },
   "body_types_male": [
     2130,

diff --git a/data/game_info.txt b/data/game_info.txt
diff --git a/data/variants.txt b/data/variants.txt
@@ -1129,6 +1129,9 @@
           "enabledForRaces": {
             "boolValue": false
           },
+          "enabledForWatopia": {
+            "boolValue": false
+          },
           "pillDistanceScale": {
             "numberValue": 0.39
           }
@@ -1240,8 +1243,11 @@
           "current_equipped_first": {
             "boolValue": true
           },
+          "sort_accessories": {
+            "boolValue": false
+          },
           "ugs_enabled": {
-            "boolValue": true
+            "boolValue": false
           },
           "use_last_selected_for_config_hash": {
             "boolValue": false
@@ -1469,6 +1475,9 @@
             "boolValue": true
           },
           "direct_download": {
+            "boolValue": true
+          },
+          "disable_cache": {
             "boolValue": false
           },
           "formatted_api": {
@@ -1506,22 +1515,26 @@
     },
     {
       "name": "game_hud_phase_1",
+      "value": true,
       "values": {
         "fields": {
           "average_power_from_bike_computer": {
             "boolValue": true
           },
           "dark_mode_color_scheme": {
-            "boolValue": false
+            "boolValue": true
           },
           "game_minimap_graph_update": {
-            "boolValue": false
+            "boolValue": true
+          },
+          "optimized_tss_calculation": {
+            "boolValue": true
           },
           "ride_stats_refactor_enabled": {
-            "boolValue": false
+            "boolValue": true
           },
           "standard_minimap_direction": {
-            "boolValue": false
+            "boolValue": true
           }
         }
       }
@@ -1603,6 +1616,15 @@
           },
           "zwift_tow_cycling_route_12": {
             "varintValue": "1635842477"
+          },
+          "zwift_tow_cycling_route_13": {
+            "varintValue": "454871454"
+          },
+          "zwift_tow_cycling_route_14": {
+            "varintValue": "3378411990"
+          },
+          "zwift_tow_cycling_route_15": {
+            "varintValue": "1092181131"
           }
         }
       }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<Zwift version="1.0.134206" sversion="1.72.0 (134206)" gbranch="rc/1.72.0" gcommit="979f0b9931044e65f899380922dfad3c7294dde6" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.134206_83b1854b_manifest.xml" manifest_checksum="1712272006" ver_cur_checksum="-410340402"/>
		<Zwift version="1.0.134595" sversion="1.72.2 (134595)" gbranch="rc/1.72.2" gcommit="451573555ef11709e60461ac84f368a122f14ddc" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.134595_ce35793d_manifest.xml" manifest_checksum="-1057907904" ver_cur_checksum="-1100226285"/>