Merge pull request #82 from rosariofrontino/dev

Kaveh, Kirara

scripts/hashes.json

@@ -115,6 +115,10 @@
         "name": "./src/lib/data/images/characters/card/kamisato_ayato.png",
         "hash": "ab9be57fe72a543e30817e66630f2aeaaf264c39"
     },
+    {
+        "name": "./src/lib/data/images/characters/card/kaveh.png",
+        "hash": "55dc6e5e2d02f08b72b8afdce72c58ffc5fdebf3"
+    },    
     {
         "name": "./src/lib/data/images/characters/card/kazuha.png",
         "hash": "9cbff0ef711d9220c6b1b9e64ea1d230dd852188"
@@ -123,6 +127,10 @@
         "name": "./src/lib/data/images/characters/card/keqing.png",
         "hash": "d1ac515726ce4941027ca974f85e83d9b3076ac2"
     },
+    {
+        "name": "./src/lib/data/images/characters/card/kirara.png",
+        "hash": "f36d98b39e943600db5b386e6bf944f6879b2efe"
+    },    
     {
         "name": "./src/lib/data/images/characters/card/klee.png",
         "hash": "3d336cb0d3d891d7d8028f679d695994c6b59420"
@@ -387,6 +395,10 @@
         "name": "./src/lib/data/images/characters/mugshot/kamisato_ayato.webp",
         "hash": "0d12e77eab29f196f46b8a4b121ef7bd7735a08a"
     },
+    {
+        "name": "./src/lib/data/images/characters/mugshot/kaveh.png",
+        "hash": "33525440abf27b24dfdaa4f793c2219f466fb8cf"
+    },    
     {
         "name": "./src/lib/data/images/characters/mugshot/kazuha.png",
         "hash": "a1e7898a8ff7c42106002c0cb3c5a1e0b52f9717"
@@ -395,6 +407,10 @@
         "name": "./src/lib/data/images/characters/mugshot/keqing.png",
         "hash": "ef35fe20e60cac93b3f176fdfb42c735ea6f7bc0"
     },
+    {
+        "name": "./src/lib/data/images/characters/mugshot/kirara.png",
+        "hash": "30784f243e96872f85e2546c2f35fca6db339ecf"
+    },    
     {
         "name": "./src/lib/data/images/characters/mugshot/klee.png",
         "hash": "2d1b297473a3d779169dbe9b37923d3d867b89e4"
@@ -1051,6 +1067,10 @@
         "name": "./src/lib/data/images/materials/mora.png",
         "hash": "2667c18ad4d62e2df627fbfbb90ba9aa2ecb486e"
     },
+    {
+        "name": "./src/lib/data/images/materials/mourning_flower.webp",
+        "hash": "fefbb7027bfc9d4f17bb98cd30878f2c22397b86"
+    },    
     {
         "name": "./src/lib/data/images/materials/mudra_of_the_malefic_general.webp",
         "hash": "f11601600025e303b8eadda2555f663fa08fd5ae"

src/assets/image_hashes.json

@@ -1550,5 +1550,25 @@
   "worldspan_fern_material": {
     "png": "8abf5296",
     "webp": "ba8c9e66"
+  },
+  "mourning_flower_material": {
+    "png": "0a2b4ac4",
+    "webp": "bc458681"
+  },
+  "kaveh_card": {
+    "png": "3050e3f7",
+    "webp": "59b20bb1"
+  },
+  "kaveh_mugshot": {
+    "png": "33525440",
+    "webp": "c67e21ed"
+  },
+  "kirara_card": {
+    "png": "8692326e",
+    "webp": "2ce5161b"
+  },
+  "kirara_mugshot": {
+    "png": "30784f24",
+    "webp": "563a7a1c"
   }
 }

src/lib/data/Characters.ts

@@ -23,6 +23,40 @@ export const Characters: { [key in CharactersKey]: ICharacter } = {
     bookGroup: ItemGroups.praxis,
     weekly: Items.puppet_strings,
   },
+  kirara: {
+    name: "Kirara",
+    normalizedName: "kirara",
+    element: Elements.dendro,
+    weaponType: WeaponTypes.sword,
+    rarity: 4,
+    sub: "Bonus HP%",
+    constellation: "Arcella",
+    description:
+      "A courier who works for Komaniya Express, a delivery company in Inazuma. She has twin restless tails and is a nekomata who loves human society.",
+    local: Items.amakumo_fruit,
+    commonGroup: ItemGroups.spectral,
+    boss: Items.evergloom_ring,
+    gemGroup: ItemGroups.dendro_gem,
+    bookGroup: ItemGroups.transience,
+    weekly: Items.everamber,
+  },
+  kaveh: {
+    name: "Kaveh",
+    normalizedName: "kaveh",
+    element: Elements.dendro,
+    weaponType: WeaponTypes.claymore,
+    rarity: 4,
+    sub: "Bonus EM",
+    constellation: "Paradisaea",
+    description:
+      "A renowned architect from Sumeru who perhaps cares a bit too much about too many things. He is an aesthete troubled by reality.",
+    local: Items.mourning_flower,
+    commonGroup: ItemGroups.fungal_spores,
+    boss: Items.quelled_creeper,
+    gemGroup: ItemGroups.dendro_gem,
+    bookGroup: ItemGroups.ingenuity,
+    weekly: Items.primordial_greenbloom,
+  },
   baizhu: {
     name: "Baizhu",
     normalizedName: "baizhu",

src/lib/data/Items.ts

@@ -8,6 +8,12 @@ export const Items: { [key in ItemsKey]: IItem } = {
     rarity: 4,
     category: "boss",
   },
+  mourning_flower: {
+    name: "Mourning Flower",
+    normalizedName: "mourning_flower",
+    rarity: 1,
+    category: "local"
+  },
   evergloom_ring: {
     name: "Evergloom Ring",
     normalizedName: "evergloom_ring",

src/lib/data/keys/CharactersKey.ts

@@ -1,4 +1,6 @@
 type CharactersKey =
+  | "kirara"
+  | "kaveh"
   | "baizhu"
   | "dehya"
   | "mika"

src/lib/data/keys/ItemsKey.ts

@@ -1,4 +1,5 @@
 type ItemsKey =
+  | "mourning_flower"
   | "evergloom_ring"
   | "primordial_greenbloom"
   | "everamber"

src/lib/viewmodel/CharactersViewModel.ts

@@ -4,6 +4,8 @@ import { IBaseCharacter } from "../data/contracts/IBaseCharacter";
 
 // This will be used to display the character cards
 export const charactersViewModel: IBaseCharacter[] = [
+  Characters.kirara,
+  Characters.kaveh,
   Characters.baizhu,
   Characters.dehya,
   Characters.mika,