💾 Miis and the Pokemon were split into separate characters

💾 Miis and the Pokemon were split into separate characters

CONTRIBUTING.md

@@ -122,15 +122,11 @@ After you've installed everything above, you need to do a couple of things to en
 
 `dotnet ef database update`
 
-3. **Import the characters into your local database**
-
-`psql Smash_ComboDatabase --file=Models/characters.sql`
-
-4. **Remove the `node_modules` file in the `ClientApp` folder**
+3. **Remove the `node_modules` file in the `ClientApp` folder**
 
 If you have <a href="https://www.npmjs.com/package/trash">Trash</a> installed, you can do `trash node_modules`
 
-5. **Install npm in `ClientApp`**
+4. **Install npm in `ClientApp`**
 
 `cd ClientApp`
 

ClientApp/src/components/allCharacterCloseUp.jsx

@@ -36,6 +36,9 @@ import Wario from '../graphics/characters/Wario/Wario-1.png'
 import Snake from '../graphics/characters/Snake/Snake-1.png'
 import Ike from '../graphics/characters/Ike/Ike-1.png'
 import PokemonTrainer from '../graphics/characters/PokemonTrainer/PokemonTrainer-1.png'
+import Squirtle from '../graphics/characters/Squirtle/Squirtle-1.png'
+import Ivysaur from '../graphics/characters/Ivysaur/Ivysaur-1.png'
+import Charizard from '../graphics/characters/Charizard/Charizard-1.png'
 import DiddyKong from '../graphics/characters/DiddyKong/DiddyKong-1.png'
 import Lucas from '../graphics/characters/Lucas/Lucas-1.png'
 import Sonic from '../graphics/characters/Sonic/Sonic-1.png'
@@ -51,7 +54,9 @@ import WiiFitTrainer from '../graphics/characters/WiiFitTrainer/WiiFitTrainer-1.
 import RosalinaAndLuma from '../graphics/characters/RosalinaAndLuma/RosalinaAndLuma-1.png'
 import LittleMac from '../graphics/characters/LittleMac/LittleMac-1.png'
 import Greninja from '../graphics/characters/Greninja/Greninja-1.png'
-import Mii from '../graphics/characters/Mii/Mii-1.png'
+import MiiBrawler from '../graphics/characters/MiiBrawler/MiiBrawler-1.png'
+import MiiSwordfighter from '../graphics/characters/MiiSwordfighter/MiiSwordfighter-1.png'
+import MiiGunner from '../graphics/characters/MiiGunner/MiiGunner-1.png'
 import Palutena from '../graphics/characters/Palutena/Palutena-1.png'
 import PacMan from '../graphics/characters/PacMan/PacMan-1.png'
 import Robin from '../graphics/characters/Robin/Robin-1.png'
@@ -117,6 +122,9 @@ export const allCharacterCloseUp = {
   Snake,
   Ike,
   PokemonTrainer,
+  Squirtle,
+  Ivysaur,
+  Charizard,
   DiddyKong,
   Lucas,
   Sonic,
@@ -132,7 +140,9 @@ export const allCharacterCloseUp = {
   RosalinaAndLuma,
   LittleMac,
   Greninja,
-  Mii,
+  MiiBrawler,
+  MiiSwordfighter,
+  MiiGunner,
   Palutena,
   PacMan,
   Robin,

ClientApp/src/components/allCharacterPortrait.jsx

@@ -35,7 +35,9 @@ import ZeroSuitSamus from '../graphics/characters/ZeroSuitSamus/ZeroSuitSamus-5.
 import Wario from '../graphics/characters/Wario/Wario-5.png'
 import Snake from '../graphics/characters/Snake/Snake-5.png'
 import Ike from '../graphics/characters/Ike/Ike-5.png'
-import PokemonTrainer from '../graphics/characters/PokemonTrainer/PokemonTrainer-5.png'
+import Squirtle from '../graphics/characters/Squirtle/Squirtle-5.png'
+import Ivysaur from '../graphics/characters/Ivysaur/Ivysaur-5.png'
+import Charizard from '../graphics/characters/Charizard/Charizard-5.png'
 import DiddyKong from '../graphics/characters/DiddyKong/DiddyKong-5.png'
 import Lucas from '../graphics/characters/Lucas/Lucas-5.png'
 import Sonic from '../graphics/characters/Sonic/Sonic-5.png'
@@ -51,7 +53,9 @@ import WiiFitTrainer from '../graphics/characters/WiiFitTrainer/WiiFitTrainer-5.
 import RosalinaAndLuma from '../graphics/characters/RosalinaAndLuma/RosalinaAndLuma-5.png'
 import LittleMac from '../graphics/characters/LittleMac/LittleMac-5.png'
 import Greninja from '../graphics/characters/Greninja/Greninja-5.png'
-import Mii from '../graphics/characters/Mii/Mii-5.png'
+import MiiBrawler from '../graphics/characters/MiiBrawler/MiiBrawler-5.png'
+import MiiSwordfighter from '../graphics/characters/MiiSwordfighter/MiiSwordfighter-5.png'
+import MiiGunner from '../graphics/characters/MiiGunner/MiiGunner-5.png'
 import Palutena from '../graphics/characters/Palutena/Palutena-5.png'
 import PacMan from '../graphics/characters/PacMan/PacMan-5.png'
 import Robin from '../graphics/characters/Robin/Robin-5.png'
@@ -116,7 +120,9 @@ export const allCharacterPortrait = {
   Wario,
   Snake,
   Ike,
-  PokemonTrainer,
+  Squirtle,
+  Ivysaur,
+  Charizard,
   DiddyKong,
   Lucas,
   Sonic,
@@ -132,7 +138,9 @@ export const allCharacterPortrait = {
   RosalinaAndLuma,
   LittleMac,
   Greninja,
-  Mii,
+  MiiBrawler,
+  MiiSwordfighter,
+  MiiGunner,
   Palutena,
   PacMan,
   Robin,

ClientApp/src/pages/Characters.jsx

@@ -64,13 +64,14 @@ export function Characters() {
 
       <h3>Choose your character</h3>
       <div className="characters">
-        {characters.map(character => (
-          <Link key={character.id} to={`/character/${character.variableName}`}>
-            <img
-              src={allCharacterCloseUp[character.variableName]}
-              alt={`${character.name}'s portrait`}
-            />
-          </Link>
+        {characters.sort((a, b) => a.ReleaseOrder - b.ReleaseOrder)
+          .map(character => (
+            <Link key={character.id} to={`/character/${character.variableName}`}>
+              <img
+                src={allCharacterCloseUp[character.variableName]}
+                alt={`${character.name}'s portrait`}
+              />
+            </Link>
         ))}
       </div>
     </div>