web-development/onmyoji-deck-builder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/shikigami_removal_out_of_order' into develop

Browse Source
This commit is contained in:
Daniel Tomlinson
2021-03-18 00:59:47 +00:00
parent 4573814d91 8a40e52604
commit 848551e00a
4 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/front_page_shikigami.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

64
src/data/shikigami_cards.json
View File

@@ -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"
},

30
src/views/DeckBuilder.vue
View File

@@ -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">
@@ -57,8 +58,8 @@
</v-select>
</v-col>
<!-- selected_shikigami_names: {{ selected_shikigami_names }} <br />
selected_shikigami_data: {{ selected_shikigami_data }} <br />
selected_shikigami_decks: {{ selected_shikigami_decks }} -->
selected_shikigami_data: {{ selected_shikigami_data }} <br /> -->
selected_shikigami_decks: {{ selected_shikigami_decks }}
</v-row>
<v-row v-for="(_, index) in selected_shikigami_names" :key="index">
<v-card elevation="2" width="100%" class="pa-3" flat tile color="#070042">
@@ -168,7 +169,28 @@ export default {
},
remove_shikigami(item) {
const index = this.selected_shikigami_names.indexOf(item.name);
if (index >= 0) this.selected_shikigami_names.splice(index, 1);
if (index >= 0) {
this.selected_shikigami_names.splice(index, 1);
this.selected_shikigami_decks[index][index].splice(0);
// shuffle shikigami down by 1
if (index <= 3) {
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] = [];
}
}
}
},
remove_decks(shiki_index, card_index) {
``;

6
src/views/Home.vue
View File

@@ -3,17 +3,17 @@
<v-row class="text-center">
<v-col cols="12">
<v-img
:src="require('../assets/logo.svg')"
:src="require('../assets/front_page_shikigami.png')"
class="my-3"
contain
height="200"
height="500"
/>
</v-col>
<v-col class="mb-4">
<h1 class="display-2 font-weight-bold mb-3">Onymoji Deck Builder</h1>
<p class="subheading font-weight-regular">Share and build decks.</p>
<p class="subheading font-weight-regular">Build and share decks.</p>
<v-btn elevation="1" x-large color="#EA6F1A">Get started</v-btn>
</v-col>
</v-row>