Merge branch 'zoffline:master' into master

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.136293, you're all set.
+  * If your Zwift version is 1.0.136426, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.136293 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.136293 and zoffline is not running from source: wait for zoffline to be updated.
+  * If your Zwift version is newer than 1.0.136426 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.136426 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.136293, you're all set.
+  * If your Zwift version is 1.0.136426, you're all set.
   * If Zwift is not installed, install it before installing zoffline.
-  * If your Zwift version is newer than 1.0.136293: 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.136426: 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

cdn/gameassets/Zwift_Updates_Root/ZwiftMac_ver_cur.xml

@@ -1 +1 @@
-<Zwift version="1.0.136293" sversion="1.77.2 (136293)" gbranch="rc/1.77.2" gcommit="0b8fa5b4caf9404e5769235092489e78d23c2bf1" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.136293_88100206_manifest.xml" manifest_checksum="566974870" ver_cur_checksum="2040570391"/>
+<Zwift version="1.0.136426" sversion="1.78.0 (136426)" gbranch="rc/1.78.0" gcommit="ea90091a68e3498d7c3868e1942d05a4b98cc092" GAME_URL="https://us-or-rly101.zwift.com" manifest="ZwiftMac_1.0.136426_1f0353f0_manifest.xml" manifest_checksum="340630008" ver_cur_checksum="575640861"/>

cdn/gameassets/Zwift_Updates_Root/Zwift_ver_cur.xml

@@ -1 +1 @@
-<Zwift version="1.0.136293" sversion="1.77.2 (136293)" gbranch="rc/1.77.2" gcommit="0b8fa5b4caf9404e5769235092489e78d23c2bf1" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.136293_88100206_manifest.xml" manifest_checksum="-1477712724" ver_cur_checksum="1138677082"/>
+<Zwift version="1.0.136426" sversion="1.78.0 (136426)" gbranch="rc/1.78.0" gcommit="ea90091a68e3498d7c3868e1942d05a4b98cc092" GAME_URL="https://us-or-rly101.zwift.com" manifest="Zwift_1.0.136426_1f0353f0_manifest.xml" manifest_checksum="236577452" ver_cur_checksum="-883372303"/>

data/events.txt

@@ -20,6 +20,13 @@
     "course": 12,
     "sport": 0
   },
+  {
+    "name": "France - Petite Douleur",
+    "route": 4159356920,
+    "distance": 24774.1,
+    "course": 14,
+    "sport": 0
+  },
   {
     "name": "France Classic Fondo",
     "route": 2136907048,
@@ -97,6 +104,13 @@
     "course": 7,
     "sport": 0
   },
+  {
+    "name": "London Flat",
+    "route": 3262665065,
+    "distance": 12378.2,
+    "course": 7,
+    "sport": 0
+  },
   {
     "name": "London Loop Reverse",
     "route": 1788889233,
@@ -223,20 +237,6 @@
     "course": 6,
     "sport": 1
   },
-  {
-    "name": "Watopia - Coast to Coast",
-    "route": 4199497144,
-    "distance": 26761.9,
-    "course": 6,
-    "sport": 0
-  },
-  {
-    "name": "Watopia - Deca Dash",
-    "route": 454871454,
-    "distance": 52575.4,
-    "course": 6,
-    "sport": 0
-  },
   {
     "name": "Watopia - Flat Route Reverse",
     "route": 3811569265,
@@ -279,13 +279,6 @@
     "course": 6,
     "sport": 0
   },
-  {
-    "name": "Watopia - Loopin Lava",
-    "route": 1092181131,
-    "distance": 18395.0,
-    "course": 6,
-    "sport": 0
-  },
   {
     "name": "Watopia - Power to the Portal",
     "route": 3030004732,
@@ -315,23 +308,16 @@
     "sport": 0
   },
   {
-    "name": "Watopia - That's Amore Reverse",
-    "route": 1586193601,
-    "distance": 5954.0,
-    "course": 6,
-    "sport": 1
-  },
-  {
-    "name": "Watopia - The Classic",
-    "route": 2698009951,
-    "distance": 9017.4,
+    "name": "Watopia - Tair Dringfa Fechan",
+    "route": 2062126722,
+    "distance": 32065.4,
     "course": 6,
     "sport": 0
   },
   {
-    "name": "Watopia - The Classic Run",
-    "route": 3068694512,
-    "distance": 9017.3,
+    "name": "Watopia - That's Amore Reverse",
+    "route": 1586193601,
+    "distance": 5954.0,
     "course": 6,
     "sport": 1
   },
@@ -349,13 +335,6 @@
     "course": 6,
     "sport": 0
   },
-  {
-    "name": "Watopia - Triple Twist",
-    "route": 2644664789,
-    "distance": 24521.1,
-    "course": 6,
-    "sport": 0
-  },
   {
     "name": "Watopia - Volcano Climb After Party",
     "route": 387309391,
@@ -377,13 +356,6 @@
     "course": 6,
     "sport": 0
   },
-  {
-    "name": "Watopia - Waisted 8",
-    "route": 3378411990,
-    "distance": 30880.4,
-    "course": 6,
-    "sport": 0
-  },
   {
     "name": "Watopia - Zwift Bambino Fondo",
     "route": 3621162212,

data/game_dictionary.txt

@@ -3,9 +3,11 @@
     9439966,
     9506232,
     16032183,
+    40090128,
     202102819,
     216566426,
     248687448,
+    269775961,
     271741505,
     284363248,
     302247979,
@@ -34,6 +36,7 @@
     1014087812,
     1021510657,
     1061365842,
+    1064307880,
     1079998558,
     1081853028,
     1087064675,
@@ -99,6 +102,7 @@
     3104058090,
     3109903878,
     3137618299,
+    3140426290,
     3249347051,
     3264601636,
     3290534814,
@@ -328,6 +332,7 @@
     3871721080,
     3914978588,
     3930950032,
+    3952990473,
     3953741983,
     3981007507,
     4011425768,
@@ -421,6 +426,7 @@
     304856285,
     307186134,
     310916269,
+    311012497,
     315634460,
     321508751,
     326883871,
@@ -971,6 +977,7 @@
     2644587674,
     2654375510,
     2662676193,
+    2665651120,
     2667207033,
     2668995113,
     2676350104,
@@ -1145,6 +1152,7 @@
     3370254609,
     3371519326,
     3372672430,
+    3377071816,
     3382087244,
     3382526362,
     3383186689,
@@ -2248,7 +2256,14 @@
     "263": 1788218813,
     "264": 3330165223,
     "265": 2927651296,
-    "266": 377566656
+    "266": 377566656,
+    "267": 454871454,
+    "268": 3378411990,
+    "269": 1092181131,
+    "270": 2698009951,
+    "271": 4199497144,
+    "272": 2644664789,
+    "273": 3068694512
   },
   "body_types_male": [
     2130,

data/start_lines.txt

@@ -44,6 +44,11 @@
     "road": 26,
     "time": 487179
   },
+  "-135610376": {
+    "name": "France - Petite Douleur",
+    "road": 0,
+    "time": 971365
+  },
   "1776635757": {
     "name": "France - R.G.V.",
     "road": 26,
@@ -174,6 +179,11 @@
     "road": 7,
     "time": 809519
   },
+  "-1032302231": {
+    "name": "London - London Flat",
+    "road": 7,
+    "time": 883587
+  },
   "913172163": {
     "name": "London - London Loop",
     "road": 7,
@@ -634,6 +644,11 @@
     "road": 2,
     "time": 905327
   },
+  "-1468627256": {
+    "name": "Scotland - Outer Scotland",
+    "road": 9,
+    "time": 1001667
+  },
   "46799750": {
     "name": "Scotland - Rolling Highlands",
     "road": 2,
@@ -1029,6 +1044,11 @@
     "road": 36,
     "time": 770795
   },
+  "2062126722": {
+    "name": "Watopia - Tair Dringfa Fechan",
+    "road": 1,
+    "time": 89601
+  },
   "-1964332641": {
     "name": "Watopia - Temple Trek",
     "road": 35,