Converted drop tables to json.

package.json

@@ -29,7 +29,7 @@
     "start": "craco start",
     "build": "craco build",
     "test": "craco test",
-    "updateDropsEphinea": "ts-node --project=tsconfig-scripts.json src/static/updateDropsEphinea.ts"
+    "updateDropsEphinea": "ts-node --project=tsconfig-scripts.json static/updateDropsEphinea.ts"
   },
   "eslintConfig": {
     "extends": "react-app"

src/domain/NpcType.ts

@@ -1,3 +1,5 @@
+import { Episode, checkEpisode } from ".";
+
 export class NpcType {
     readonly id: number;
     readonly code: string;
@@ -59,11 +61,9 @@ export class NpcType {
     /**
      * Uniquely identifies an NPC. Tries to match on simpleName and ultimateName.
      */
-    static byNameAndEpisode(name: string, episode: number): NpcType | undefined {
+    static byNameAndEpisode(name: string, episode: Episode): NpcType | undefined {
-        const ep = this.byEpAndName[episode];
+        checkEpisode(episode);
-        if (!ep) throw new Error(`No NpcTypes for episode ${episode}.`);
+        return this.byEpAndName[episode]!.get(name);
-
-        return ep.get(name);
     }
 
     //

src/domain/index.ts

@@ -18,6 +18,18 @@ export enum Server {
 
 export const Servers: Server[] = enumValues(Server);
 
+export enum Episode {
+    I = 1,
+    II = 2,
+    IV = 4
+}
+
+export function checkEpisode(episode: Episode) {
+    if (!Episode[episode]) {
+        throw new Error(`Invalid episode ${episode}.`);
+    }
+}
+
 export enum SectionId {
     Viridia = 'Viridia',
     Greenill = 'Greenill',
@@ -102,7 +114,7 @@ export class Quest {
     @observable shortDescription: string;
     @observable longDescription: string;
     @observable questNo?: number;
-    @observable episode: number;
+    @observable episode: Episode;
     @observable areaVariants: AreaVariant[];
     @observable objects: QuestObject[];
     @observable npcs: QuestNpc[];
@@ -120,7 +132,7 @@ export class Quest {
         shortDescription: string,
         longDescription: string,
         questNo: number | undefined,
-        episode: number,
+        episode: Episode,
         areaVariants: AreaVariant[],
         objects: QuestObject[],
         npcs: QuestNpc[],
@@ -128,7 +140,7 @@ export class Quest {
         binData: ArrayBufferCursor
     ) {
         if (questNo != null && (!Number.isInteger(questNo) || questNo < 0)) throw new Error('questNo should be null or a non-negative integer.');
-        if (episode !== 1 && episode !== 2 && episode !== 4) throw new Error('episode should be 1, 2 or 4.');
+        checkEpisode(episode);
         if (!objects || !(objects instanceof Array)) throw new Error('objs is required.');
         if (!npcs || !(npcs instanceof Array)) throw new Error('npcs is required.');
 

src/dto.ts

@@ -0,0 +1,24 @@
+import { Difficulty, SectionId } from "./domain";
+
+export type ItemDto = {
+    name: string,
+}
+
+export type EnemyDropDto = {
+    difficulty: Difficulty,
+    episode: number,
+    sectionId: SectionId,
+    enemy: string,
+    item: string,
+    dropRate: number,
+    rareRate: number,
+}
+
+export type BoxDropDto = {
+    difficulty: Difficulty,
+    episode: number,
+    sectionId: SectionId,
+    box: string,
+    item: string,
+    dropRate: number,
+}

src/static/updateDropsEphinea.ts

@@ -1,166 +0,0 @@
-import 'isomorphic-fetch';
-import cheerio from 'cheerio';
-import fs from 'fs';
-
-const SECTION_IDS = [
-    'Viridia', 'Greenill', 'Skyly', 'Bluefull', 'Purplenum', 'Pinkal', 'Redria', 'Oran', 'Yellowboze', 'Whitill',
-];
-const ENEMY_DROPS_HEADER = ['difficulty', 'episode', 'section_id', 'enemy', 'item', 'drop_rate', 'rare_rate'];
-const BOX_DROPS_HEADER = ['difficulty', 'episode', 'section_id', 'box', 'item', 'drop_rate'];
-const ITEMS_HEADER = ['name'];
-
-async function update() {
-    const normal = await download('normal');
-    const hard = await download('hard');
-    const vhard = await download('vhard', 'very-hard');
-    const ultimate = await download('ultimate');
-
-    const enemyCsv =
-        [
-            ENEMY_DROPS_HEADER,
-            ...normal.enemyDrops,
-            ...hard.enemyDrops,
-            ...vhard.enemyDrops,
-            ...ultimate.enemyDrops
-        ]
-            .map(r => r.join('\t'))
-            .join('\n');
-
-    await fs.promises.writeFile('./public/enemy_drops.ephinea.tsv', enemyCsv);
-
-    const boxCsv =
-        [
-            BOX_DROPS_HEADER,
-            ...normal.boxDrops,
-            ...hard.boxDrops,
-            ...vhard.boxDrops,
-            ...ultimate.boxDrops
-        ]
-            .map(r => r.join('\t'))
-            .join('\n');
-
-    await fs.promises.writeFile('./public/box_drops.ephinea.tsv', boxCsv);
-
-    const items = new Set([...normal.items, ...hard.items, ...vhard.items, ...ultimate.items]);
-
-    const itemsCsv =
-        [
-            ITEMS_HEADER,
-            ...[...items].sort()
-        ]
-            .join('\n');
-
-    await fs.promises.writeFile('./public/items.ephinea.tsv', itemsCsv);
-}
-
-async function download(mode: string, modeUrl: string = mode) {
-    const response = await fetch(`https://ephinea.pioneer2.net/drop-charts/${modeUrl}/`);
-    const body = await response.text();
-    const $ = cheerio.load(body);
-
-    let episode = 1;
-    const data: {
-        enemyDrops: any[][], boxDrops: any[][], items: Set<string>
-    } = {
-        enemyDrops: [], boxDrops: [], items: new Set()
-    };
-
-    $('table').each((tableI, table) => {
-        const isBox = tableI >= 3;
-
-        $('tr', table).each((_, tr) => {
-            const monsterText = $(tr.firstChild).text();
-
-            if (monsterText.trim() === '') {
-                return;
-            } else if (monsterText.startsWith('EPISODE ')) {
-                episode = parseInt(monsterText.slice(-1), 10);
-                return;
-            }
-
-            try {
-                let monster = monsterText.split('/')[mode === 'ultimate' ? 1 : 0] || monsterText;
-
-                if (monster === 'Halo Rappy') {
-                    monster = 'Hallo Rappy';
-                } else if (monster === 'Dal Ral Lie') {
-                    monster = 'Dal Ra Lie';
-                } else if (monster === 'Vol Opt ver. 2') {
-                    monster = 'Vol Opt ver.2';
-                } else if (monster === 'Za Boota') {
-                    monster = 'Ze Boota';
-                } else if (monster === 'Saint Million') {
-                    monster = 'Saint-Milion';
-                }
-
-                $('td', tr).each((tdI, td) => {
-                    if (tdI === 0) {
-                        return;
-                    }
-
-                    const sectionId = SECTION_IDS[tdI - 1];
-
-                    if (isBox) {
-                        $('font font', td).each((_, font) => {
-                            const item = $('b', font).text();
-                            const rateNum = parseFloat($('sup', font).text());
-                            const rateDenom = parseFloat($('sub', font).text());
-
-                            data.boxDrops.push(
-                                [
-                                    mode,
-                                    episode,
-                                    sectionId,
-                                    monster,
-                                    item,
-                                    rateNum / rateDenom
-                                ]
-                            );
-
-                            data.items.add(item);
-                        });
-                        return;
-                    } else {
-                        const item = $('font b', td).text();
-
-                        if (item.trim() === '') {
-                            return;
-                        }
-
-                        try {
-                            const title = $('font abbr', td).attr('title').replace('\r', '');
-                            const [, dropRateNum, dropRateDenom] =
-                                /Drop Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
-                            const [, rareRateNum, rareRateDenom] =
-                                /Rare Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
-
-                            data.enemyDrops.push(
-                                [
-                                    mode,
-                                    episode,
-                                    sectionId,
-                                    monster,
-                                    item,
-                                    dropRateNum / dropRateDenom,
-                                    rareRateNum / rareRateDenom,
-                                ]
-                            );
-
-                            data.items.add(item);
-                        } catch (e) {
-                            console.error(`Error while processing item ${item} of ${monster} in episode ${episode} ${mode}.`, e);
-                        }
-                    }
-                });
-            } catch (e) {
-                console.error(`Error while processing ${monsterText} in episode ${episode} ${mode}.`, e);
-            }
-        });
-    });
-
-    return data;
-}
-
-update().catch((e) => {
-    console.error(e);
-});

src/stores/ItemDropStore.ts

@@ -4,6 +4,7 @@ import { EnumMap } from "../enums";
 import { Loadable } from "../Loadable";
 import { itemStore } from "./ItemStore";
 import { ServerMap } from "./ServerMap";
+import { EnemyDropDto } from "../dto";
 
 class EnemyDropTable {
     private map: EnumMap<Difficulty, EnumMap<SectionId, Map<NpcType, EnemyDrop>>> =
@@ -25,73 +26,24 @@ class ItemDropStore {
 
     private loadEnemyDrops = async (server: Server): Promise<EnemyDropTable> => {
         const response = await fetch(
-            `${process.env.PUBLIC_URL}/enemy_drops.${Server[server].toLowerCase()}.tsv`
+            `${process.env.PUBLIC_URL}/enemyDrops.${Server[server].toLowerCase()}.json`
         );
-        const data = await response.text();
+        const data: Array<EnemyDropDto> = await response.json();
-        const lines = data.split('\n');
-        const lineCount = lines.length;
 
         const drops = new EnemyDropTable();
 
-        for (let i = 1; i < lineCount; i++) {
+        for (const dropDto of data) {
-            const line = lines[i];
+            const npcType = NpcType.byNameAndEpisode(dropDto.enemy, dropDto.episode);
-            const lineNo = i + 1;
-            const cells = line.split('\t');
-            const diffStr = cells[0].toLowerCase();
-
-            const diff =
-                diffStr === 'normal' ? Difficulty.Normal
-                    : diffStr === 'hard' ? Difficulty.Hard
-                        : diffStr === 'vhard' ? Difficulty.VHard
-                            : diffStr === 'ultimate' ? Difficulty.Ultimate
-                                : undefined;
-
-            if (!diff) {
-                console.error(`Couldn't parse difficulty for line ${lineNo}.`);
-                continue;
-            }
-
-            const episode = parseInt(cells[1], 10);
-
-            if (episode !== 1 && episode !== 2 && episode !== 4) {
-                console.error(`Couldn't parse episode for line ${lineNo}.`);
-                continue;
-            }
-
-            const sectionId: SectionId | undefined = (SectionId as any)[cells[2]];
-
-            if (!sectionId) {
-                console.error(`Couldn't parse section_id for line ${lineNo}.`);
-                continue;
-            }
-
-            const enemyName = cells[3];
-
-            const anythingRate = parseFloat(cells[5]);
-
-            if (!isFinite(anythingRate)) {
-                console.error(`Couldn't parse drop_rate for line ${lineNo}.`);
-                continue;
-            }
-
-            const rareRate = parseFloat(cells[6]);
-
-            if (!rareRate) {
-                console.error(`Couldn't parse rare_rate for line ${lineNo}.`);
-                continue;
-            }
-
-            const npcType = NpcType.byNameAndEpisode(enemyName, episode);
 
             if (!npcType) {
-                console.error(`Couldn't determine enemy type for line ${lineNo}.`);
+                console.error(`Couldn't determine NpcType of episode ${dropDto.episode} ${dropDto.enemy}.`);
                 continue;
             }
 
-            drops.setDrop(diff, sectionId, npcType, new EnemyDrop(
+            drops.setDrop(dropDto.difficulty, dropDto.sectionId, npcType, new EnemyDrop(
-                itemStore.dedupItem(cells[4]),
+                itemStore.dedupItem(dropDto.item),
-                anythingRate,
+                dropDto.dropRate,
-                rareRate
+                dropDto.rareRate
             ));
         }
 

src/stores/ItemStore.ts

@@ -2,8 +2,7 @@ import { observable } from "mobx";
 import { Item, Server } from "../domain";
 import { Loadable } from "../Loadable";
 import { ServerMap } from "./ServerMap";
-
+import { ItemDto } from "../dto";
-type ItemDTO = { name: string }
 
 class ItemStore {
     private itemMap = new Map<string, Item>();
@@ -26,7 +25,7 @@ class ItemStore {
         const response = await fetch(
             `${process.env.PUBLIC_URL}/items.${Server[server].toLowerCase()}.json`
         );
-        const data: Array<ItemDTO> = await response.json();
+        const data: Array<ItemDto> = await response.json();
         return data.map(({ name }) => this.dedupItem(name));
     }
 }

static/updateDropsEphinea.ts

@@ -0,0 +1,145 @@
+import 'isomorphic-fetch';
+import cheerio from 'cheerio';
+import fs from 'fs';
+import { Difficulty, SectionIds } from '../src/domain';
+import { EnemyDropDto, ItemDto, BoxDropDto } from '../src/dto';
+
+async function update() {
+    const normal = await download(Difficulty.Normal);
+    const hard = await download(Difficulty.Hard);
+    const vhard = await download(Difficulty.VHard, 'very-hard');
+    const ultimate = await download(Difficulty.Ultimate);
+
+    const enemyJson = JSON.stringify([
+        ...normal.enemyDrops,
+        ...hard.enemyDrops,
+        ...vhard.enemyDrops,
+        ...ultimate.enemyDrops
+    ], null, 4);
+
+    await fs.promises.writeFile('./public/enemyDrops.ephinea.json', enemyJson);
+
+    const boxJson = JSON.stringify([
+        ...normal.boxDrops,
+        ...hard.boxDrops,
+        ...vhard.boxDrops,
+        ...ultimate.boxDrops
+    ], null, 4);
+
+    await fs.promises.writeFile('./public/boxDrops.ephinea.json', boxJson);
+
+    const itemNames = new Set([...normal.items, ...hard.items, ...vhard.items, ...ultimate.items]);
+    const items: Array<ItemDto> = [...itemNames].sort().map(name => ({ name }));
+    const itemsJson = JSON.stringify(items, null, 4);
+
+    await fs.promises.writeFile('./public/items.ephinea.json', itemsJson);
+}
+
+async function download(difficulty: Difficulty, difficultyUrl: string = difficulty.toLowerCase()) {
+    const response = await fetch(`https://ephinea.pioneer2.net/drop-charts/${difficultyUrl}/`);
+    const body = await response.text();
+    const $ = cheerio.load(body);
+
+    let episode = 1;
+    const data: {
+        enemyDrops: Array<EnemyDropDto>, boxDrops: Array<BoxDropDto>, items: Set<string>
+    } = {
+        enemyDrops: [], boxDrops: [], items: new Set()
+    };
+
+    $('table').each((tableI, table) => {
+        const isBox = tableI >= 3;
+
+        $('tr', table).each((_, tr) => {
+            const enemyOrBoxText = $(tr.firstChild).text();
+
+            if (enemyOrBoxText.trim() === '') {
+                return;
+            } else if (enemyOrBoxText.startsWith('EPISODE ')) {
+                episode = parseInt(enemyOrBoxText.slice(-1), 10);
+                return;
+            }
+
+            try {
+                let enemyOrBox = enemyOrBoxText.split('/')[difficulty === Difficulty.Ultimate ? 1 : 0]
+                    || enemyOrBoxText;
+
+                if (enemyOrBox === 'Halo Rappy') {
+                    enemyOrBox = 'Hallo Rappy';
+                } else if (enemyOrBox === 'Dal Ral Lie') {
+                    enemyOrBox = 'Dal Ra Lie';
+                } else if (enemyOrBox === 'Vol Opt ver. 2') {
+                    enemyOrBox = 'Vol Opt ver.2';
+                } else if (enemyOrBox === 'Za Boota') {
+                    enemyOrBox = 'Ze Boota';
+                } else if (enemyOrBox === 'Saint Million') {
+                    enemyOrBox = 'Saint-Milion';
+                }
+
+                $('td', tr).each((tdI, td) => {
+                    if (tdI === 0) {
+                        return;
+                    }
+
+                    const sectionId = SectionIds[tdI - 1];
+
+                    if (isBox) {
+                        $('font font', td).each((_, font) => {
+                            const item = $('b', font).text();
+                            const rateNum = parseFloat($('sup', font).text());
+                            const rateDenom = parseFloat($('sub', font).text());
+
+                            data.boxDrops.push({
+                                difficulty,
+                                episode,
+                                sectionId,
+                                box: enemyOrBox,
+                                item,
+                                dropRate: rateNum / rateDenom
+                            });
+
+                            data.items.add(item);
+                        });
+                        return;
+                    } else {
+                        const item = $('font b', td).text();
+
+                        if (item.trim() === '') {
+                            return;
+                        }
+
+                        try {
+                            const title = $('font abbr', td).attr('title').replace('\r', '');
+                            const [, dropRateNum, dropRateDenom] =
+                                /Drop Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
+                            const [, rareRateNum, rareRateDenom] =
+                                /Rare Rate: (\d+)\/(\d+(\.\d+)?)/g.exec(title)!.map(parseFloat);
+
+                            data.enemyDrops.push({
+                                difficulty,
+                                episode,
+                                sectionId,
+                                enemy: enemyOrBox,
+                                item,
+                                dropRate: dropRateNum / dropRateDenom,
+                                rareRate: rareRateNum / rareRateDenom,
+                            });
+
+                            data.items.add(item);
+                        } catch (e) {
+                            console.error(`Error while processing item ${item} of ${enemyOrBox} in episode ${episode} ${difficulty}.`, e);
+                        }
+                    }
+                });
+            } catch (e) {
+                console.error(`Error while processing ${enemyOrBoxText} in episode ${episode} ${difficulty}.`, e);
+            }
+        });
+    });
+
+    return data;
+}
+
+update().catch((e) => {
+    console.error(e);
+});

tsconfig-scripts.json

@@ -20,6 +20,6 @@
     "downlevelIteration": true
   },
   "include": [
-    "src"
+    "static"
   ]
 }