Add new abyss leylines, fix Shenhe typo

Author: Tibowl

src/commands/misc/abyss.ts

@@ -2,7 +2,7 @@ import { AutocompleteInteraction, CommandInteraction, Message, MessageEmbed } fr
 
 import Command from "../../utils/Command"
 import client from "../../main"
-import { Colors, findFuzzyBestCandidates, sendMessage, simplePaginator } from "../../utils/Utils"
+import { Colors, findFuzzyBestCandidates, getDate, sendMessage, simplePaginator } from "../../utils/Utils"
 import { AbyssSchedule, CommandSource, SendMessage } from "../../utils/Types"
 import config from "../../data/config.json"
 
@@ -26,7 +26,7 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
             options: [{
                 name: "floor",
                 description: "Directly skip to a certain floor",
-                type: "NUMBER",
+                type: "INTEGER",
                 required: false
             }, {
                 name: "cycle",
@@ -49,7 +49,7 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
 
     async runInteraction(source: CommandInteraction): Promise<SendMessage | undefined> {
         const { options } = source
-        return this.run(source, options.getNumber("floor") ?? -1, options.getString("cycle"))
+        return this.run(source, options.getInteger("floor") ?? -1, options.getString("cycle"))
 
     }
     async runMessage(source: Message, args: string[]): Promise<SendMessage | undefined> {
@@ -72,7 +72,10 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
     async run(source: CommandSource, floor: number, abyssSchedule?: string | null): Promise<SendMessage | undefined> {
         const { data } = client
         const schedule = data.getAbyssSchedules()
-        let abyss = schedule[schedule.length - 1]
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        let abyss = schedule.filter(schedule =>
+            Date.now() >= getDate(schedule.start).getTime()
+        ).pop()!
 
         if (abyssSchedule) {
             const matchedDate = abyssSchedule.match(/^(\d\d\d\d)-(\d\d?)-(\d)$/)
@@ -84,9 +87,10 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
             if (!abyss)
                 return sendMessage(source, `Couldn't find abyss \`${line}\``)
         }
-        if (floor > 0 && floor <= abyss.regularFloors.length) {
+        if (!abyss)
+            return sendMessage(source, "Couldn't find last abyss")
+        if (floor > 0 && floor <= abyss.regularFloors.length)
             return sendMessage(source, this.getSpiralFloor(abyss.regularFloors[floor - 1], floor))
-        }
 
         const defaultPage = floor > 0 ? floor - abyss.regularFloors.length : 0
 
@@ -124,13 +128,15 @@ Old abyss floors/buffs can be accessed by giving the cycle (like \`${config.pref
             .setTitle(`Floor ${num}`)
             .setDescription(floor.leyline)
 
-        const lastChamber = floor.chambers[floor.chambers.length - 1]
-        for (const chamber of floor.chambers) {
-            embed.addField(`Chamber ${chamber.chamber}: Conditions`, chamber.conds)
+        if (floor.chambers) {
+            const lastChamber = floor.chambers[floor.chambers.length - 1]
+            for (const chamber of floor.chambers) {
+                embed.addField(`Chamber ${chamber.chamber}: Conditions`, chamber.conds)
 
-            for (const [ind, monsters] of Object.entries(chamber.monsters)) {
-                const status = `${+ind+1}/${chamber.monsters.length}`
-                embed.addField(`${names[status] ?? status}: (Lv. ${chamber.level})`, `${monsters.join("\n")}${chamber == lastChamber ? "" : "\n\u200B"}`, true)
+                for (const [ind, monsters] of Object.entries(chamber.monsters)) {
+                    const status = `${+ind+1}/${chamber.monsters.length}`
+                    embed.addField(`${names[status] ?? status}: (Lv. ${chamber.level})`, `${monsters.join("\n")}${chamber == lastChamber ? "" : "\n\u200B"}`, true)
+                }
             }
         }
 

src/data/gamedata/abyss_floors.json

@@ -1921,5 +1921,13 @@
         ]
       }
     ]
+  },
+  "34": {
+    "teams": 2,
+    "leyline": "All party members' Normal Attack DMG increased by 50%."
+  },
+  "35": {
+    "teams": 2,
+    "leyline": "Certain opponents in this challenge possess the Honed Spirit effect, which grants them 10% Physical and All Elemental RES. When opponents with Honed Spirit take hits from attacks that are considered Normal Attack DMG, they will lose 3% Physical and All Elemental RES. A maximum of 30% of each may be lost this way. The RES lost this way will be reset every 20s."
   }
 }

src/data/gamedata/abyss_schedule.json

@@ -702,5 +702,71 @@
       32,
       33
     ]
+  },
+  "32": {
+    "start": "2022-01-16 04:00:00",
+    "end": "2022-02-01 03:59:59",
+    "buff": "Blade-Flourish Moon",
+    "buffDesc": "When the active character's Normal, Charged, or Plunging Attacks hit opponents multiple times within 2s, that character's Normal, Charged, and Plunging Attack DMG is increased by 5% for 8s. Max 15 stacks. This effect can be triggered once every 0.1s and will be cleared if the character goes down or leaves the field.",
+    "regularFloors": [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ],
+    "spiralAbyssFloors": [
+      24,
+      25,
+      34,
+      35
+    ]
+  },
+  "33": {
+    "start": "2022-02-01 04:00:00",
+    "end": "2022-02-16 03:59:59",
+    "buff": "Blooming Moon",
+    "buffDesc": "When the active character hits opponents with attacks that are considered Normal Attack DMG, there is a 50% chance of unleashing a shockwave at the hit opponent's position, dealing AoE True DMG. One shockwave can be released in this way every 0.3s.",
+    "regularFloors": [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ],
+    "spiralAbyssFloors": [
+      24,
+      25,
+      34,
+      35
+    ]
+  },
+  "34": {
+    "start": "2022-02-16 04:00:00",
+    "end": "2022-03-01 03:59:59",
+    "buff": "Awakening Moon",
+    "buffDesc": "When the active character's Normal, Charged, or Plunging Attacks hit opponents multiple times within 2s, the character gains a stack of Emergence for 8s. This effect can be triggered once every 0.1s. Emergence will be cleared when the character goes down or leaves the field. When the character gains 15 Emergence stacks, the stacks will be cleared and a shockwave will be unleashed that deals True DMG to nearby opponents. After a shockwave is unleashed in this way, all party members will deal 25% increased DMG for 10s.",
+    "regularFloors": [
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8
+    ],
+    "spiralAbyssFloors": [
+      24,
+      25,
+      34,
+      35
+    ]
   }
 }

src/data/gamedata/characters.json

@@ -18168,7 +18168,7 @@
   },
   "Shenhe": {
     "name": "Shenhe",
-    "desc": "An adepti disciple with a most unusual air about her. having spent much time cultivating in isolation in Liyue's mountains, she has become every bit as cool and distant as the adepti themselves.",
+    "desc": "An adepti disciple with a most unusual air about her. Having spent much time cultivating in isolation in Liyue's mountains, she has become every bit as cool and distant as the adepti themselves.",
     "star": 5,
     "weaponType": "Polearm",
     "icon": "https://i.imgur.com/ccLge5X.png",
@@ -18181,7 +18181,8 @@
       "birthDay": 10,
       "association": "Liyue",
       "title": "Lonesome Transcendence",
-      "detail": "An adepti disciple with a most unusual air about her. having spent much time cultivating in isolation in Liyue's mountains, she has become every bit as cool and distant as the adepti themselves.",
+      "detail": "An adepti disciple with a most unusual air about her. Having spent much time cultivating in isolation in Liyue's mountains, she has become every bit as cool and distant as the adepti themselves.",
+      "affiliation": "Liyue Harbor",
       "element": "Cryo",
       "constellation": "Crista Doloris",
       "cvChinese": "秦紫翼",
@@ -25175,6 +25176,8 @@
     "name": "Yun Jin",
     "desc": "A renowned Liyue opera singer who is skilled in both playwriting and singing. Her style is one-of-a-kind, exquisite and delicate, much like the person herself.",
     "icon": "https://i.imgur.com/BrcAmXj.png",
+    "star": 4,
+    "weaponType": "Polearm",
     "imgs": [
       "https://upload-os-bbs.hoyolab.com/upload/2021/11/22/1015537/d35ba124ac2d9af4772fa6e7925624bc_2825394445059469033.jpg",
       "https://upload-os-bbs.hoyolab.com/upload/2021/11/22/1015537/8fd08b431a58addf9d16451c8da93236_3542243023422706080.jpg"
@@ -25183,12 +25186,13 @@
       "association": "Liyue",
       "title": "Stage Lucida",
       "detail": "A renowned Liyue opera singer who is skilled in both playwriting and singing. Her style is one-of-a-kind, exquisite and delicate, much like the person herself.",
+      "affiliation": "Yun-Han Opera Troupe",
       "element": "Geo",
       "constellation": "Opera Grandis",
-      "cvChinese": "贺文潇 & 杨扬",
+      "cvChinese": "贺文潇&杨扬",
+      "cvJapanese": "小岩井ことり&杨扬",
       "cvEnglish": "Judy Alice Lee & 杨扬",
-      "cvJapanese": "小岩井ことり & 杨扬",
-      "cvKorean": "사문영 & 杨扬"
+      "cvKorean": "사문영&Yang Yang"
     },
     "skills": [
       {

src/utils/DataManager.ts

@@ -3,6 +3,7 @@ import { exists, unlink, move, writeFile, existsSync, readFileSync } from "fs-ex
 import { join } from "path"
 
 import { Artifact, ArtifactType, MainStatInfo, Character, BotEmoji, Store, Weapon, Cost, AbyssSchedule, AbyssFloor, Event, PaimonShop, Guide, CharacterFull, CostTemplate } from "./Types"
+import { findFuzzy } from "./Utils"
 
 import artifactsData from "../data/gamedata/artifacts.json"
 import artifactsMainStats from "../data/gamedata/artifact_main_stats.json"
@@ -29,8 +30,6 @@ import emojiData from "../data/emojis.json"
 import eventData from "../data/events.json" // Not in gamedata since it also contains webevents
 import guideData from "../data/guides.json"
 
-import { findFuzzy, getDate } from "./Utils"
-
 const Logger = log4js.getLogger("DataManager")
 const existsP = async (path: string): Promise<boolean> => new Promise((resolve) => exists(path, resolve))
 
@@ -137,9 +136,7 @@ export default class DataManager {
     }
 
     getAbyssSchedules(): AbyssSchedule[] {
-        return Object.values(this.abyssSchedule).filter(schedule =>
-            Date.now() >= getDate(schedule.start).getTime()
-        )
+        return Object.values(this.abyssSchedule)
     }
 
     getArtifactByName(name: string): Artifact | undefined {

src/utils/Types.ts

@@ -497,9 +497,9 @@ export enum WeaponCurveName {
 }
 
 export interface AbyssFloor {
-    teams:    number
-    leyline:  string
-    chambers: AbyssChamber[]
+    teams:     number
+    leyline:   string
+    chambers?: AbyssChamber[]
 }
 
 export interface AbyssChamber {