From 8a40e5260413f153fad88382be4608fc22fc89df Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Wed, 17 Mar 2021 17:26:20 +0000
Subject: [PATCH] adding latest working

---
 src/data/shikigami_cards.json | 64 +++++++++++++++++------------------
 src/views/DeckBuilder.vue     | 39 +++++++++------------
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/src/data/shikigami_cards.json b/src/data/shikigami_cards.json
index 49c9406..f13923a 100644
--- a/src/data/shikigami_cards.json
+++ b/src/data/shikigami_cards.json
@@ -49,22 +49,22 @@
   {
     "name": "Shiki_2",
     "cards": [
-      { "id": "01ccb58e", "name": "shiki_2_card_0", "url": "https://shiki_2_card_0.png" },
-      { "id": "14f56042", "name": "shiki_2_card_0", "url": "https://shiki_2_card_0.png" },
-      { "id": "9a254d1b", "name": "shiki_2_card_1", "url": "https://shiki_2_card_1.png" },
-      { "id": "69f4fdb2", "name": "shiki_2_card_1", "url": "https://shiki_2_card_1.png" },
-      { "id": "df6c5fed", "name": "shiki_2_card_2", "url": "https://shiki_2_card_2.png" },
-      { "id": "bb45fa3d", "name": "shiki_2_card_2", "url": "https://shiki_2_card_2.png" },
-      { "id": "b542a22d", "name": "shiki_2_card_3", "url": "https://shiki_2_card_3.png" },
-      { "id": "9c456857", "name": "shiki_2_card_3", "url": "https://shiki_2_card_3.png" },
-      { "id": "dff9a535", "name": "shiki_2_card_4", "url": "https://shiki_2_card_4.png" },
-      { "id": "aafef844", "name": "shiki_2_card_4", "url": "https://shiki_2_card_4.png" },
-      { "id": "32afefe6", "name": "shiki_2_card_5", "url": "https://shiki_2_card_5.png" },
-      { "id": "2883340a", "name": "shiki_2_card_5", "url": "https://shiki_2_card_5.png" },
-      { "id": "a3272322", "name": "shiki_2_card_6", "url": "https://shiki_2_card_6.png" },
-      { "id": "4cce0001", "name": "shiki_2_card_6", "url": "https://shiki_2_card_6.png" },
-      { "id": "5f36e966", "name": "shiki_2_card_7", "url": "https://shiki_2_card_7.png" },
-      { "id": "aceb124d", "name": "shiki_2_card_7", "url": "https://shiki_2_card_7.png" }
+      { "id": "01ccb58e", "name": "shiki_2_card_0", "url": "AD.png" },
+      { "id": "14f56042", "name": "shiki_2_card_0", "url": "AD.png" },
+      { "id": "9a254d1b", "name": "shiki_2_card_1", "url": "KD.png" },
+      { "id": "69f4fdb2", "name": "shiki_2_card_1", "url": "KD.png" },
+      { "id": "df6c5fed", "name": "shiki_2_card_2", "url": "2D.png" },
+      { "id": "bb45fa3d", "name": "shiki_2_card_2", "url": "2D.png" },
+      { "id": "b542a22d", "name": "shiki_2_card_3", "url": "3D.png" },
+      { "id": "9c456857", "name": "shiki_2_card_3", "url": "3D.png" },
+      { "id": "dff9a535", "name": "shiki_2_card_4", "url": "4D.png" },
+      { "id": "aafef844", "name": "shiki_2_card_4", "url": "4D.png" },
+      { "id": "32afefe6", "name": "shiki_2_card_5", "url": "5D.png" },
+      { "id": "2883340a", "name": "shiki_2_card_5", "url": "5D.png" },
+      { "id": "a3272322", "name": "shiki_2_card_6", "url": "6D.png" },
+      { "id": "4cce0001", "name": "shiki_2_card_6", "url": "6D.png" },
+      { "id": "5f36e966", "name": "shiki_2_card_7", "url": "7D.png" },
+      { "id": "aceb124d", "name": "shiki_2_card_7", "url": "7D.png" }
     ],
     "avatar": "avatar_0.png"
   },
@@ -77,22 +77,22 @@
   {
     "name": "Shiki_3",
     "cards": [
-      { "id": "a2d14b50", "name": "shiki_3_card_0", "url": "https://shiki_3_card_0.png" },
-      { "id": "5e781f61", "name": "shiki_3_card_0", "url": "https://shiki_3_card_0.png" },
-      { "id": "3ac7b446", "name": "shiki_3_card_1", "url": "https://shiki_3_card_1.png" },
-      { "id": "ed75a6d1", "name": "shiki_3_card_1", "url": "https://shiki_3_card_1.png" },
-      { "id": "e3fa8e21", "name": "shiki_3_card_2", "url": "https://shiki_3_card_2.png" },
-      { "id": "5de5f2f5", "name": "shiki_3_card_2", "url": "https://shiki_3_card_2.png" },
-      { "id": "cfaff11f", "name": "shiki_3_card_3", "url": "https://shiki_3_card_3.png" },
-      { "id": "7dc06ad2", "name": "shiki_3_card_3", "url": "https://shiki_3_card_3.png" },
-      { "id": "f3eac1e9", "name": "shiki_3_card_4", "url": "https://shiki_3_card_4.png" },
-      { "id": "d6063473", "name": "shiki_3_card_4", "url": "https://shiki_3_card_4.png" },
-      { "id": "b982300e", "name": "shiki_3_card_5", "url": "https://shiki_3_card_5.png" },
-      { "id": "099e6321", "name": "shiki_3_card_5", "url": "https://shiki_3_card_5.png" },
-      { "id": "cac026ec", "name": "shiki_3_card_6", "url": "https://shiki_3_card_6.png" },
-      { "id": "28d709ad", "name": "shiki_3_card_6", "url": "https://shiki_3_card_6.png" },
-      { "id": "e37841b5", "name": "shiki_3_card_7", "url": "https://shiki_3_card_7.png" },
-      { "id": "8a7a1fe6", "name": "shiki_3_card_7", "url": "https://shiki_3_card_7.png" }
+      { "id": "a2d14b50", "name": "shiki_3_card_0", "url": "AC.png" },
+      { "id": "5e781f61", "name": "shiki_3_card_0", "url": "AC.png" },
+      { "id": "3ac7b446", "name": "shiki_3_card_1", "url": "KC.png" },
+      { "id": "ed75a6d1", "name": "shiki_3_card_1", "url": "KC.png" },
+      { "id": "e3fa8e21", "name": "shiki_3_card_2", "url": "2C.png" },
+      { "id": "5de5f2f5", "name": "shiki_3_card_2", "url": "2C.png" },
+      { "id": "cfaff11f", "name": "shiki_3_card_3", "url": "3C.png" },
+      { "id": "7dc06ad2", "name": "shiki_3_card_3", "url": "3C.png" },
+      { "id": "f3eac1e9", "name": "shiki_3_card_4", "url": "4C.png" },
+      { "id": "d6063473", "name": "shiki_3_card_4", "url": "4C.png" },
+      { "id": "b982300e", "name": "shiki_3_card_5", "url": "5C.png" },
+      { "id": "099e6321", "name": "shiki_3_card_5", "url": "5C.png" },
+      { "id": "cac026ec", "name": "shiki_3_card_6", "url": "6C.png" },
+      { "id": "28d709ad", "name": "shiki_3_card_6", "url": "6C.png" },
+      { "id": "e37841b5", "name": "shiki_3_card_7", "url": "7C.png" },
+      { "id": "8a7a1fe6", "name": "shiki_3_card_7", "url": "7C.png" }
     ],
     "avatar": "avatar_0.png"
   },
diff --git a/src/views/DeckBuilder.vue b/src/views/DeckBuilder.vue
index 8e75091..fe969f6 100644
--- a/src/views/DeckBuilder.vue
+++ b/src/views/DeckBuilder.vue
@@ -1,5 +1,6 @@
 <template>
-  <v-container fluid px-16 pb-10>
+  <!-- <v-container fluid px-16 pb-10> -->
+  <v-container>
     <v-row>
       <v-col cols="12">
         <div class="text-center">
@@ -169,33 +170,25 @@ export default {
     remove_shikigami(item) {
       const index = this.selected_shikigami_names.indexOf(item.name);
       if (index >= 0) {
-        console.log(`index: ${index}`);
         this.selected_shikigami_names.splice(index, 1);
         this.selected_shikigami_decks[index][index].splice(0);
         // shuffle shikigami down by 1
-        console.log(
-          `length of next: ${
-            this.selected_shikigami_decks[index + 1][index + 1].length
-          }`
-        );
         if (index <= 3) {
-          for (
-            let i = 0;
-            i < this.selected_shikigami_decks[index + 1][index + 1].length;
-            i++
-          ) {
-            console.log(`i: ${i}`);
-            this.selected_shikigami_decks[index][index].push(
-              this.selected_shikigami_decks[index + 1][index + 1][i]
-            );
-            // this.selected_shikigami_decks[index + 1][index + 1].splice(i, 1);
-
-            // push/pop
-            // this.selected_shikigami_decks[index][index].push(
-            //   this.selected_shikigami_decks[index + 1][index + 1].pop()
-            // );
+          for (let j = index; j <= 2; j++) {
+            for (
+              let i = 0;
+              i < this.selected_shikigami_decks[j + 1][j + 1].length;
+              i++
+            ) {
+              // this if is optional?
+              if (index < 3) {
+                this.selected_shikigami_decks[j][j].push(
+                  this.selected_shikigami_decks[j + 1][j + 1][i]
+                );
+              }
+            }
+            this.selected_shikigami_decks[j + 1][j + 1] = [];
           }
-          this.selected_shikigami_decks[index + 1][index + 1] = [];
         }
       }
     },