mcg/mlpcardgame
2
0
Fork 0
Code Issues 23 Pull requests 1 Releases Wiki Activity

Properly initialize images database

Browse source
This commit is contained in:
Hamcha 2019-09-08 23:36:07 +02:00
parent f67ad90f69
commit 0eb8e1a47d
Signed by: hamcha
GPG key ID: 44AD3571EB09A39E
4 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mlpccg/database.ts
View file

@ -1,15 +1,16 @@
import Dexie from "dexie"; import Dexie from "dexie";
import { Card, CardFilter } from "./types"; import { Card, CardFilter, StoredImages } from "./types";
import { cardFullName } from "./card"; import { cardFullName } from "./card";
class CardDatabase extends Dexie { class CardDatabase extends Dexie {
public cards: Dexie.Table<Card, string>; public cards: Dexie.Table<Card, string>;
public images: Dexie.Table<Blob, string>; public images: Dexie.Table<StoredImages, string>;
public constructor() { public constructor() {
super("CardDatabase"); super("CardDatabase");
this.version(1).stores({ this.version(1).stores({
cards: "ID,Set,Type,Cost,Power" cards: "ID,Set,Type,Cost,Power",
images: "id"
}); });
this.cards = this.table("cards"); this.cards = this.table("cards");
this.images = this.table("images"); this.images = this.table("images");

2
src/mlpccg/images.ts
View file

@ -25,7 +25,7 @@ export async function getImages() {
url: `${imgBaseURL}${img}`, url: `${imgBaseURL}${img}`,
responseType: "blob" responseType: "blob"
}); });
return table.put(req.data, img); return table.put({ id: img, image: req.data });
}); });
return await Promise.all(promises); return await Promise.all(promises);
} }

5
src/mlpccg/types.ts
View file

@ -2,6 +2,11 @@ export type Rarity = "C" | "U" | "R" | "SR" | "UR" | "RR";
export type PowerRequirement = { [key: string]: number }; export type PowerRequirement = { [key: string]: number };
export interface StoredImages {
id: string;
image: Blob;
}
export interface SetFile { export interface SetFile {
Name: string; Name: string;
Cards: Card[]; Cards: Card[];

32
src/views/DeckBuilder.vue
View file

@ -187,23 +187,27 @@ function sortByColor(a: Card, b: Card) {
switch (a.Type) { switch (a.Type) {
case "Friend": case "Friend":
case "Mane Character": case "Mane Character":
const elemA = multiElemStr(a.Element); {
const elemB = multiElemStr(b.Element); const elemA = multiElemStr(a.Element);
if (elemA > elemB) { const elemB = multiElemStr(b.Element);
return 1; if (elemA > elemB) {
} return 1;
if (elemB > elemA) { }
return -1; if (elemB > elemA) {
return -1;
}
} }
break; break;
case "Problem": case "Problem":
const preqA = multiElemStr(Object.keys(a.ProblemRequirement!)); if (a.ProblemRequirement && b.ProblemRequirement) {
const preqB = multiElemStr(Object.keys(b.ProblemRequirement!)); const preqA = multiElemStr(Object.keys(a.ProblemRequirement));
if (preqA > preqB) { const preqB = multiElemStr(Object.keys(b.ProblemRequirement));
return 1; if (preqA > preqB) {
} return 1;
if (preqB > preqA) { }
return -1; if (preqB > preqA) {
return -1;
}
} }
break; break;
case "Event": case "Event":