Hoenn changes

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .idea/
-build/
+build/
+*.db

README.md

@@ -35,7 +35,7 @@ This means you don't need to compile TypeScript yourself. Gulp will do this for
 
 
 ## Use Google cloud shell _(alternative)_
-[![Google Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pokeclicker-dev/pokeclicker&git_branch=develop&page=editor&open_in_editor=README.md)
+[![Google Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pokeclicker/pokeclicker&git_branch=develop&page=editor&open_in_editor=README.md)
 ```cmd
 npm install
 npm start

package.json

@@ -14,7 +14,7 @@
   },
   "babel": {
     "presets": [
-      "es2015"
+      "env"
     ]
   },
   "author": "IshaD",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/jquery": "^3.3.31",
     "babel-core": "^6.26.3",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.7.0",
     "babel-register": "^6.26.0",
     "bootstrap-notify": "^3.1.3",
     "browser-sync": "^2.26.7",
@@ -57,7 +57,7 @@
     "natives": "^1.1.6",
     "run-sequence": "^1.1.4",
     "tslint": "^3.15.1",
-    "typescript": "^2.9.2"
+    "typescript": "^3.7.4"
   },
   "dependencies": {
     "@types/bootstrap": "^3.4.0",

src/components/gameMenu.html

@@ -34,6 +34,9 @@
         <li>
             <a class="dropdown-item" href="https://pokeclicker.reddit.com" target="_blank">Subreddit</a>
         </li>
+        <li>
+            <a class="dropdown-item" href="https://discordapp.com/invite/rHF3V54" target="_blank">Discord</a>
+        </li>
         <li>
             <a class="dropdown-item" href="https://gitreports.com/issue/Ishadijcks/pokeclicker" target="_blank">Report a bug</a>
         </li>

src/components/receiveGymBadge.html

@@ -14,7 +14,7 @@
        <div class="modal-body">
            <p data-bind="text: GymRunner.gymObservable().defeatMessage"></p>
            <!-- ko if: !GameConstants.Badge[GymRunner.gymObservable().badgeReward].startsWith('Elite') -->
-           <img src="" width="56px" data-bind="attr:{ src: 'assets/images/badges/' + GymRunner.gymObservable().leaderName + '.png'}">
+           <img src="" width="56px" data-bind="attr:{ src: 'assets/images/badges/' + GameConstants.Badge[GymRunner.gymObservable().badgeReward] + '.png'}">
            <!-- /ko -->
 
        </div>

src/components/settingsModal.html

@@ -28,6 +28,6 @@
     <td>
         <select class="form-control" onchange="Settings.setSettingByName(this.name, this.value)" data-bind="foreach: $data.options, attr: {name}">
             <option data-bind="text: $data.text, value: $data.value, attr:{ selected: Settings.getSetting('theme').observableValue() == $data.value}"></option>
-        </div>
+        </select>
     </td>
 </script>

src/components/starterCaught.html

@@ -13,7 +13,7 @@ <h5 class="modal-title" id="starterCaughtModalLabel">Professor Oak</h5>
                Hm! Excellent! You have caught your first pokémon!<br>
                This is where your journey begins. <br>
                You can progress to the next route after you have defeated 10 pokémon.<br>
-               To help you on you journey, I will give you these <b>Key items</b>!<br>
+               To help you on your journey, I will give you these <b>Key items</b>!<br>
                You can view all your <b>Key items</b> in the start menu.<br>
            </p>
            <div class="row justify-content-center">
@@ -50,4 +50,4 @@ <h5 class="modal-title" id="starterCaughtModalLabel">Professor Oak</h5>
        </div>
    </div>
 </div>
-</div>
+</div>

src/scripts/GameConstants.ts

@@ -19,7 +19,7 @@ namespace GameConstants {
     export const ACHIEVEMENT_TICK = 1000;
     export const MIN_LOAD_TIME = 500;
 
-    export const MAX_AVAILABLE_REGION = 2;
+    export const MAX_AVAILABLE_REGION = 1;
 
     export const TotalPokemonsPerRegion = [
         151, // 151

src/scripts/GameHelper.ts

@@ -64,7 +64,7 @@ class GameHelper {
       } else if (n >= 1e3){
         return Math.floor(n / 1e3) + "k";
       }
-      return n;
+      return `${n}`;
     }
 
     public static getIndexFromDistribution(a: number[]) {

src/scripts/Player.ts

@@ -234,7 +234,7 @@ class Player {
 
     private highestRegion: KnockoutObservable<GameConstants.Region>;
 
-    public caughtAndShinyList(): KnockoutComputed<number> {
+    public caughtAndShinyList(): KnockoutComputed<string[]> {
         return ko.computed(function () {
             const pokeList = this.caughtPokemonList.map(pokemon=>pokemon.name);
             return this.caughtShinyList().filter(pokemon=>pokeList.includes(pokemon));

src/scripts/achievements/Statistics.ts

@@ -26,7 +26,7 @@ class Statistics {
         "totalShards": GameHelper.enumLength(GameConstants.PokemonType) - 1,  // remove "None" pokemon type
         "oakItemUses": GameHelper.enumLength(GameConstants.OakItem),
         "berriesHarvested": GameHelper.enumLength(GameConstants.BerryType),
-    }
+    };
 
     constructor(saved = {}) {
         let observables = [

src/scripts/pokemons/DataPokemon.ts

@@ -5,8 +5,8 @@ class DataPokemon implements pokemonInterface {
     id: number;
     name: string;
     catchRate: number;
-    evolution: string;
-    evoLevel: number;
+    evolution: any[];
+    evoLevel: any[];
     type1: GameConstants.PokemonType;
     type2: GameConstants.PokemonType;
     attack: number;
@@ -15,7 +15,7 @@ class DataPokemon implements pokemonInterface {
     eggCycles: number;
     shiny: boolean;
 
-    constructor(id: number, name: string, catchRate: number, evolution: string, evoLevel: number, type1: GameConstants.PokemonType, type2: GameConstants.PokemonType, attack: number, levelType: GameConstants.LevelType, exp: number, eggCycles: number) {
+    constructor(id: number, name: string, catchRate: number, evolution: any[], evoLevel: any[], type1: GameConstants.PokemonType, type2: GameConstants.PokemonType, attack: number, levelType: GameConstants.LevelType, exp: number, eggCycles: number) {
         this.id = id;
         this.name = name;
         this.catchRate = catchRate;