Added code support for forms

* Updated pokedex.csv to include a column for `form` as a string identifier
* Changed data retrieval to get pokemon by species and form, not just species
* Changed pokemon generation and species changes to include form
* Updated image retrieval to includ form
* Updated image source to static.dpsplus.app domain

Author: jakawell

src/app/home/home.component.ts

@@ -187,7 +187,7 @@ export class HomeComponent implements OnInit {
                 this.shadowDefenderInput = defender;
               }
               else { // no saved value, so creating new one
-                this.shadowDefenderInput = new PokemonModel(381, this.dataService, input.code, input.name, false, false);
+                this.shadowDefenderInput = new PokemonModel(381, null, this.dataService, input.code, input.name, false, false);
                 this.shadowDefenderInput.level = 40;
                 this.shadowDefenderInput.attackIv = 15;
                 this.shadowDefenderInput.defenseIv = 15;
@@ -300,7 +300,7 @@ export class HomeComponent implements OnInit {
   private addPokemon(code: string, title: string, isRemovable: boolean, atIndex: number) {
     if (this.shadowPokemonInputs.length <= atIndex) { // we don't have a shadow pokemon in memory
       let defaultPokemon = atIndex == 0 ? 149 : (atIndex == 1 ? 384 : (Math.floor(Math.random() * 386) + 1));
-      const newPokemon = new PokemonModel(defaultPokemon, this.dataService, code, title, isRemovable, false);
+      const newPokemon = new PokemonModel(defaultPokemon, null, this.dataService, code, title, isRemovable, false);
       this.shadowPokemonInputs.push(newPokemon);
     }
     else { // we do have a shadow pokemon, and need to update the code and title

src/app/shared/components/pokemon-input/pokemon-input.component.html

@@ -6,7 +6,7 @@ <h2>{{ model.internalTitle }}</h2>
     </button>
   </div>
   <div fxLayout fxLayoutGap="8px">
-    <img class="pokemon-image" src="https://dpsplus-assets.firebaseapp.com/mon-icons/{{selectedSpecies}}.svg" alt="{{selectedName}} image" width="72" height="72" />
+    <img class="pokemon-image" src="https://static.dpsplus.app/mon-icons/{{selectedSpecies + (selectedForm || '')}}.svg" alt="{{selectedName}} image" width="72" height="72" />
     <div fxLayout="column" fxLayoutAlign="start">
 
       <mat-form-field class="pokemon-name-input">

src/app/shared/components/pokemon-input/pokemon-input.component.ts

@@ -34,6 +34,7 @@ export class PokemonInputComponent implements OnInit {
   public pokemonForm: FormGroup;
   public filteredPokemon: Observable<any[]>;
   public selectedSpecies: number;
+  public selectedForm: string;
   public selectedName: string;
 
   private _id: string;
@@ -63,7 +64,8 @@ export class PokemonInputComponent implements OnInit {
       if (typeof value !== 'string') {
         this.selectedName = value[0];
         this.selectedSpecies = value[1] as number;
-        this.model.species = this.selectedSpecies;
+        this.selectedForm = value[2] as string;
+        this.model.changeSpecies(this.selectedSpecies, this.selectedForm);
       }
     });
     this.pokemonForm.get('level').valueChanges.forEach((value: number) => this.model.level = value);
@@ -85,7 +87,7 @@ export class PokemonInputComponent implements OnInit {
 
   public submitForm() {
     const formModel = this.pokemonForm.value;
-    this.model.species = this.selectedSpecies;
+    this.model.changeSpecies(this.selectedSpecies, this.selectedForm);
     this.model.level = formModel.level as number;
     this.model.attackIv = formModel.attackIv as number;
     this.model.defenseIv = formModel.defenseIv as number;
@@ -101,7 +103,7 @@ export class PokemonInputComponent implements OnInit {
 
   private resetForm() {
     this.pokemonForm.reset({
-      species: [this.model.name, this.model.species],
+      species: [this.model.name, this.model.species, this.model.form],
       level: this.model.level,
       attackIv: this.model.attackIv,
       defenseIv: this.model.defenseIv,

src/app/shared/models/pokemon.model.ts

@@ -3,6 +3,7 @@ import { DataService } from '../services/data.service';
 
 export class PokemonModel {
   private _species: number;
+  private _form: string;
   public name: string;
   public type1: string;
   public type2: string;
@@ -24,8 +25,8 @@ export class PokemonModel {
   public isRemovable: boolean;
   public canSelectMoves: boolean;
 
-  constructor(species: number,  private dataService: DataService, internalId?: string, internalTitle?: string, isRemovable?: boolean, canSelectMoves?: boolean) {
-    this.species = species;
+  constructor(species: number, form: string, private dataService: DataService, internalId?: string, internalTitle?: string, isRemovable?: boolean, canSelectMoves?: boolean) {
+    this.changeSpecies(species, form);
     this.level = 30;
     this.attackIv = 15;
     this.defenseIv = 15;
@@ -39,15 +40,48 @@ export class PokemonModel {
     this.canSelectMoves = canSelectMoves || false;
   }
 
-  set species(species: number) {
+  get species(): number {
+    return this._species;
+  }
+
+  get form(): string {
+    return this._form;
+  }
+
+  get levelMultiplier(): number {
+    return this.dataService.getLevelMultiplier(this.level);
+  }
+
+  get attack(): number {
+    return (this.attackBase + this.attackIv) * this.levelMultiplier;
+  }
+
+  get defense(): number {
+    return (this.defenseBase + this.defenseIv) * this.levelMultiplier;
+  }
+
+  get stamina(): number {
+    return (this.staminaBase + this.staminaIv) * this.levelMultiplier;
+  }
+
+  get cp(): number {
+    return Math.floor(Math.max((this.attack * Math.pow(this.defense, 0.5) * Math.pow(this.stamina, 0.5) * Math.pow(this.levelMultiplier, 2)) / 10, 10));
+  }
+
+  get paddedNumber(): string {
+    return (this.species < 10 ? '00' + this.species : (this.species < 100) ? '0' + this.species : '' + this.species);
+  }
+
+  public changeSpecies(species: number, form: string) {
     this._species = species;
-    let pokedexData = this.dataService.getPokemon(species);
+    this._form = form;
+    let pokedexData = this.dataService.getPokemon(species, form);
     this.name = pokedexData[0];
-    this.type1 = pokedexData[2];
-    this.type2 = (pokedexData[3] && pokedexData[3] != 'N/A') ? pokedexData[3] : null;
-    this.attackBase = parseInt(pokedexData[4]);
-    this.defenseBase = parseInt(pokedexData[5]);
-    this.staminaBase = parseInt(pokedexData[6]);
+    this.type1 = pokedexData[3];
+    this.type2 = (pokedexData[4] && pokedexData[4] != 'N/A') ? pokedexData[4] : null;
+    this.attackBase = parseInt(pokedexData[5]);
+    this.defenseBase = parseInt(pokedexData[6]);
+    this.staminaBase = parseInt(pokedexData[7]);
 
     if (this._species == 151) { // darn you mew. y u break all the things.
       const mewQuick = [ "c",
@@ -98,41 +132,15 @@ export class PokemonModel {
       this.parseMoves(mewCharge, false); // parse charge moves
     }
     else {
-      this.parseMoves(pokedexData.slice(7, 21), true); // parse quick moves
-      this.parseMoves(pokedexData.slice(21, 37), false); // parse charge moves
+      this.parseMoves(pokedexData.slice(8, 22), true); // parse quick moves
+      this.parseMoves(pokedexData.slice(22, 38), false); // parse charge moves
     }
   }
-  get species(): number {
-    return this._species;
-  }
-
-  get levelMultiplier(): number {
-    return this.dataService.getLevelMultiplier(this.level);
-  }
-
-  get attack(): number {
-    return (this.attackBase + this.attackIv) * this.levelMultiplier;
-  }
-
-  get defense(): number {
-    return (this.defenseBase + this.defenseIv) * this.levelMultiplier;
-  }
-
-  get stamina(): number {
-    return (this.staminaBase + this.staminaIv) * this.levelMultiplier;
-  }
-
-  get cp(): number {
-    return Math.floor(Math.max((this.attack * Math.pow(this.defense, 0.5) * Math.pow(this.stamina, 0.5) * Math.pow(this.levelMultiplier, 2)) / 10, 10));
-  }
-
-  get paddedNumber(): string {
-    return (this.species < 10 ? '00' + this.species : (this.species < 100) ? '0' + this.species : '' + this.species);
-  }
 
   public serialize() {
     return JSON.stringify({
       species: this.species,
+      form: this.form,
       level: this.level,
       attackIv: this.attackIv,
       defenseIv: this.defenseIv,
@@ -149,7 +157,9 @@ export class PokemonModel {
 
   public deserialize(source: string) {
     const sourceObj: any = JSON.parse(source);
-    if (sourceObj.species) this.species = sourceObj.species;
+    if (sourceObj.species) {
+      this.changeSpecies(sourceObj.species, sourceObj.form);
+    }
     if (sourceObj.level) this.level = sourceObj.level;
     if (sourceObj.attackIv) this.attackIv = sourceObj.attackIv;
     if (sourceObj.defenseIv) this.defenseIv = sourceObj.defenseIv;

src/app/shared/services/data.service.ts

@@ -63,8 +63,11 @@ export class DataService {
     return this._PokedexAlpha.slice();
   }
 
-  getPokemon(index: number): any[] {
-    return this._Pokedex[index];
+  getPokemon(species: number, form: string): any[] {
+    for (let pokemon of this._Pokedex)
+      if (pokemon[1] == species && (!form || pokemon[2] == form))
+        return pokemon;
+    return null;
   }
 
   getLevelMultiplier(level: number): number {

src/app/shared/services/dpsplus.service.ts

@@ -384,7 +384,7 @@ export class DpsPlusService {
     }
     else {
       for (let pokemon of this.dataService.getPokedex()) {
-        let selectedPokemon = new PokemonModel(pokemon[1], this.dataService);
+        let selectedPokemon = new PokemonModel(pokemon[1], pokemon[2], this.dataService);
         selectedPokemon.level = 30;
         selectedPokemon.attackIv = 15;
         selectedPokemon.defenseIv = 15;

src/app/shared/services/storage.service.ts

@@ -105,7 +105,7 @@ export class StorageService {
     if (!pokemonSerialized)
       return null;
     const pokemon: any = JSON.parse(pokemonSerialized);
-    const result = new PokemonModel(pokemon.species, this.dataService);
+    const result = new PokemonModel(pokemon.species, pokemon.form, this.dataService);
     result.deserialize(pokemonSerialized);
     return result;
   }