readied update for the beta2.0

ForwardFeed · Apr 21, 2024 · ab2f7c1 · ab2f7c1
1 parent 44f811b
commit ab2f7c1
Show file tree

Hide file tree

Showing 52 changed files with 12 additions and 12 deletions.
diff --git a/static/js/data/additionalVAlpha.json b/static/js/data/additionalVAlpha.json
diff --git a/static/js/data/comparifyAlpha1.6.1.json b/static/js/data/comparifyAlpha1.6.1.json
diff --git a/static/js/data/gameDataV1.6.1.json b/static/js/data/gameDataV1.6.1.json
diff --git a/static/js/data/gameDataVAlpha.json b/static/js/data/gameDataVAlpha.json
diff --git a/static/js/data/gameDataVAlphatest.json b/static/js/data/gameDataVAlphatest.json
diff --git a/static/js/data_version.js b/static/js/data_version.js
@@ -9,12 +9,13 @@ export let compareData;
 export let gameData;
 // each time the data is modified, this is updated
 // so the client checks if it have the latest version by checking lo
-const LATEST_DATA_VERSION = "35"/*%%VERSION%%*/
+const LATEST_DATA_VERSION = "38"/*%%VERSION%%*/
 
 const allVersions = [
     "1.6.1",
-    "Alpha",
+    "Beta2.0",
 ]
+
 const defaultVersion = "1.6.1"
 
 function setAvailableVersion(){
@@ -25,12 +26,14 @@ function setAvailableVersion(){
         option.innerText = version
         fragment.append(option)
     }
-    const version = $('#versions').val() || fetchFromLocalstorage("lastusedversion")
+    let savedVersion = fetchFromLocalstorage("lastusedversion")
+    if (allVersions.indexOf(savedVersion) == -1) savedVersion = defaultVersion
+    const version = $('#versions').val() || savedVersion
     $('#versions').append(fragment).val(version)
 }
 let forceRefresh = false
 export function changeVersion(version=defaultVersion, firstLoad=false){
-    if (!version /*|| allVersions.indexOf(version) == -1*/){
+    if (!version){
         console.warn(`no such version : ${version}, defaulting to ${defaultVersion}`)
         version = defaultVersion
     }

diff --git a/static/sprites/AGGRON_MEGA.png b/static/sprites/AGGRON_MEGA.png
diff --git a/static/sprites/CHARCADET.png b/static/sprites/CHARCADET.png
diff --git a/static/sprites/DUOSION_REDUX.png b/static/sprites/DUOSION_REDUX.png
diff --git a/static/sprites/ENAMORUS_THERIAN.png b/static/sprites/ENAMORUS_THERIAN.png
diff --git a/static/sprites/FERALIGATR_MEGA_Y.png b/static/sprites/FERALIGATR_MEGA_Y.png
diff --git a/static/sprites/GARCHOMP_MEGA.png b/static/sprites/GARCHOMP_MEGA.png
diff --git a/static/sprites/HAXORUS_MEGA.png b/static/sprites/HAXORUS_MEGA.png
diff --git a/static/sprites/IRON_JUGULIS.png b/static/sprites/IRON_JUGULIS.png
diff --git a/static/sprites/PYROAR.png b/static/sprites/PYROAR.png
diff --git a/static/sprites/REUNICLUS_REDUX.png b/static/sprites/REUNICLUS_REDUX.png
diff --git a/static/sprites/SHINY_AGGRON_MEGA.png b/static/sprites/SHINY_AGGRON_MEGA.png
diff --git a/static/sprites/SHINY_CHARCADET.png b/static/sprites/SHINY_CHARCADET.png
diff --git a/static/sprites/SHINY_DIALGA_ORIGIN.png b/static/sprites/SHINY_DIALGA_ORIGIN.png
diff --git a/static/sprites/SHINY_DUOSION_REDUX.png b/static/sprites/SHINY_DUOSION_REDUX.png
diff --git a/static/sprites/SHINY_ENAMORUS_THERIAN.png b/static/sprites/SHINY_ENAMORUS_THERIAN.png
diff --git a/static/sprites/SHINY_FERALIGATR_MEGA_Y.png b/static/sprites/SHINY_FERALIGATR_MEGA_Y.png
diff --git a/static/sprites/SHINY_GARCHOMP_MEGA.png b/static/sprites/SHINY_GARCHOMP_MEGA.png
diff --git a/static/sprites/SHINY_HAXORUS_MEGA.png b/static/sprites/SHINY_HAXORUS_MEGA.png
diff --git a/static/sprites/SHINY_IRON_JUGULIS.png b/static/sprites/SHINY_IRON_JUGULIS.png
diff --git a/static/sprites/SHINY_PALAFIN_HERO.png b/static/sprites/SHINY_PALAFIN_HERO.png
diff --git a/static/sprites/SHINY_PALKIA_ORIGIN.png b/static/sprites/SHINY_PALKIA_ORIGIN.png
diff --git a/static/sprites/SHINY_PYROAR.png b/static/sprites/SHINY_PYROAR.png
diff --git a/static/sprites/SHINY_REUNICLUS_REDUX.png b/static/sprites/SHINY_REUNICLUS_REDUX.png
diff --git a/static/sprites/SHINY_SOLOSIS_REDUX.png b/static/sprites/SHINY_SOLOSIS_REDUX.png
diff --git a/static/sprites/SHINY_SQUAWKABILLY.png b/static/sprites/SHINY_SQUAWKABILLY.png
diff --git a/static/sprites/SHINY_SQUAWKABILLY_BLUE_PLUMAGE.png b/static/sprites/SHINY_SQUAWKABILLY_BLUE_PLUMAGE.png
diff --git a/static/sprites/SHINY_SQUAWKABILLY_GREEN_PLUMAGE.png b/static/sprites/SHINY_SQUAWKABILLY_GREEN_PLUMAGE.png
diff --git a/static/sprites/SHINY_SQUAWKABILLY_WHITE_PLUMAGE.png b/static/sprites/SHINY_SQUAWKABILLY_WHITE_PLUMAGE.png
diff --git a/static/sprites/SHINY_SQUAWKABILLY_YELLOW_PLUMAGE.png b/static/sprites/SHINY_SQUAWKABILLY_YELLOW_PLUMAGE.png
diff --git a/static/sprites/SHINY_TAUROS_PALDEAN_AQUA_BREED.png b/static/sprites/SHINY_TAUROS_PALDEAN_AQUA_BREED.png
diff --git a/static/sprites/SHINY_TAUROS_PALDEAN_BLAZE_BREED.png b/static/sprites/SHINY_TAUROS_PALDEAN_BLAZE_BREED.png
diff --git a/static/sprites/SHINY_TAUROS_PALDEAN_COMBAT_BREED.png b/static/sprites/SHINY_TAUROS_PALDEAN_COMBAT_BREED.png
diff --git a/static/sprites/SHINY_TYPHLOSION_HISUIAN.png b/static/sprites/SHINY_TYPHLOSION_HISUIAN.png
diff --git a/static/sprites/SHINY_URSALUNA_BLOODMOON.png b/static/sprites/SHINY_URSALUNA_BLOODMOON.png
diff --git a/static/sprites/SHINY_WIGLETT.png b/static/sprites/SHINY_WIGLETT.png
diff --git a/static/sprites/SOLOSIS_REDUX.png b/static/sprites/SOLOSIS_REDUX.png
diff --git a/static/sprites/SQUAWKABILLY.png b/static/sprites/SQUAWKABILLY.png
diff --git a/static/sprites/SQUAWKABILLY_BLUE_PLUMAGE.png b/static/sprites/SQUAWKABILLY_BLUE_PLUMAGE.png
diff --git a/static/sprites/SQUAWKABILLY_WHITE_PLUMAGE.png b/static/sprites/SQUAWKABILLY_WHITE_PLUMAGE.png
diff --git a/static/sprites/SQUAWKABILLY_YELLOW_PLUMAGE.png b/static/sprites/SQUAWKABILLY_YELLOW_PLUMAGE.png
diff --git a/static/sprites/TAUROS_PALDEAN_AQUA_BREED.png b/static/sprites/TAUROS_PALDEAN_AQUA_BREED.png
diff --git a/static/sprites/TAUROS_PALDEAN_BLAZE_BREED.png b/static/sprites/TAUROS_PALDEAN_BLAZE_BREED.png
diff --git a/static/sprites/TAUROS_PALDEAN_COMBAT_BREED.png b/static/sprites/TAUROS_PALDEAN_COMBAT_BREED.png
diff --git a/static/sprites/TYPHLOSION_HISUIAN.png b/static/sprites/TYPHLOSION_HISUIAN.png
diff --git a/static/sprites/URSALUNA_BLOODMOON.png b/static/sprites/URSALUNA_BLOODMOON.png
diff --git a/update_data.sh b/update_data.sh
@@ -13,10 +13,10 @@ echo ${prjAlpha}
 tsc
 
 # fetch the multiples version
-cd "${prj}"
-git checkout origin/ReduxForms
+cd "${prjAlpha}"
+git checkout 90d39b7a723c9605593d50b105cd505766fe443f
 cd "${curr}"
-npm run run -- -o Alpha -rd -sv 0
+npm run run -- -o Beta2.0 -rd -ip ${prjAlpha} -sv 1
 cd "${prj}"
 git checkout origin/master
 cd "${curr}"