Merge branch 'Estyms-main' into main

src/data/itemGroup.js

@@ -31,11 +31,21 @@ export const itemGroup = {
     items: [itemList.teachings_of_prosperity, itemList.guide_to_prosperity, itemList.philosophies_of_prosperity],
     type: 'book',
   },
+  teachings_of_transience: {
+    name: 'Transience',
+    items: [itemList.teachings_of_transience, itemList.guide_to_transience, itemList.philosophies_of_transience],
+    type: 'book',
+  },
   teachings_of_elegance: {
     name: 'Elegance',
     items: [itemList.teachings_of_elegance, itemList.guide_to_elegance, itemList.philosophies_of_elegance],
     type: 'book',
   },
+  teachings_of_light: {
+    name: 'Light',
+    items: [itemList.teachings_of_light, itemList.guide_to_light, itemList.philosophies_of_light],
+    type: 'book',
+  },
   tile_of_decarabians_tower: {
     name: 'Decarabian',
     items: [
@@ -97,7 +107,7 @@ export const itemGroup = {
     type: 'weapon',
   },
   coral_branch_of_a_distant_sea: {
-    name: 'Coral',
+    name: 'Distant Sea',
     items: [
       itemList.coral_branch_of_a_distant_sea,
       itemList.jeweled_branch_of_a_distant_sea,
@@ -106,6 +116,21 @@ export const itemGroup = {
     ],
     type: 'weapon',
   },
+  narukamis_wisdom: {
+    name: 'Narukami',
+    items: [itemList.narukamis_wisdom, itemList.narukamis_joy, itemList.narukamis_affection, itemList.narukamis_valor],
+    type: 'weapon',
+  },
+  mask_of_the_wicked_lieutenant: {
+    name: 'Mask',
+    items: [
+      itemList.mask_of_the_wicked_lieutenant,
+      itemList.mask_of_the_tigers_bite,
+      itemList.mask_of_the_one_horned,
+      itemList.mask_of_the_kijin,
+    ],
+    type: 'weapon',
+  },
   agnidus_agate_sliver: {
     name: 'Agnidus Agate',
     items: [
@@ -241,4 +266,16 @@ export const itemGroup = {
     name: 'Chaos Gear',
     items: [itemList.chaos_gear, itemList.chaos_axis, itemList.chaos_oculus],
   },
+  old_handguard: {
+    name: 'Hanguard',
+    items: [items.old_handguard, items.kageuchi_handguard, items.famed_handguard],
+  },
+  chaos_gear: {
+    name: 'Gear',
+    items: [items.chaos_gear, items.chaos_axis, items.chaos_oculus],
+  },
+  dismal_prism: {
+    name: 'Prism',
+    items: [items.dismal_prism, items.crystal_prism, items.polarizing_prism],
+  },
 };

src/data/itemList.js

@@ -641,59 +641,171 @@ export const itemList = {
   sea_ganoderma: { id: 'sea_ganoderma', name: 'Sea Ganoderma' },
   marionette_core: { id: 'marionette_core', name: 'Marionette Core', rarity: 4 },
   gilded_scale: { id: 'gilded_scale', name: 'Gilded Scale', rarity: 5 },
-  perpetual_heart: { id: 'perpetual_heart', name: 'Perpetual Heart', rarity: 4 },
-  sakura_bloom: { id: 'sakura_bloom', name: 'Sakura Bloom' },
-  old_handguard: { id: 'old_handguard', name: 'Old Handguard' },
-  kageuchi_handguard: { id: 'kageuchi_handguard', name: 'Kageuchi Handguard' },
-  famed_handguard: { id: 'famed_handguard', name: 'Famed Handguard' },
-  teachings_of_elegance: {
-    id: 'teachings_of_elegance',
-    name: 'Teachings of Elegance',
-    day: ['wednesday', 'saturday'],
-    rarity: 2,
-  },
-  guide_to_elegance: {
-    id: 'guide_to_elegance',
-    name: 'Guide to Elegance',
-    day: ['wednesday', 'saturday'],
-    rarity: 3,
-    parent: 'teachings_of_elegance',
-  },
-  philosophies_of_elegance: {
-    id: 'philosophies_of_elegance',
-    name: 'Philosophies of Elegance',
-    day: ['wednesday', 'saturday'],
-    rarity: 4,
-    parent: 'teachings_of_elegance',
-  },
   coral_branch_of_a_distant_sea: {
     id: 'coral_branch_of_a_distant_sea',
     name: 'Coral Branch of a Distant Sea',
-    day: ['wednesday', 'saturday'],
+    day: ['monday', 'thursday'],
     rarity: 1,
   },
   jeweled_branch_of_a_distant_sea: {
     id: 'jeweled_branch_of_a_distant_sea',
     name: 'Jeweled Branch of a Distant Sea',
-    day: ['wednesday', 'saturday'],
+    day: ['monday', 'thursday'],
     rarity: 2,
     parent: 'coral_branch_of_a_distant_sea',
   },
   jade_branch_of_a_distant_sea: {
     id: 'jade_branch_of_a_distant_sea',
     name: 'Jade Branch of a Distant Sea',
-    day: ['wednesday', 'saturday'],
+    day: ['monday', 'thursday'],
     rarity: 3,
     parent: 'coral_branch_of_a_distant_sea',
   },
   golden_branch_of_a_distant_sea: {
     id: 'golden_branch_of_a_distant_sea',
-    name: 'Golden Branch of a Distant Sea',
-    day: ['wednesday', 'saturday'],
+    name: 'Golden Branck of a Golden Sea',
+    day: ['monday', 'thursday'],
     rarity: 4,
     parent: 'coral_branch_of_a_distant_sea',
   },
+
+  narukamis_wisdom: {
+    id: 'narukamis_wisdom',
+    name: "Narukami's Wisdom",
+    day: ['tuesday', 'friday'],
+    rarity: 1,
+  },
+  narukamis_joy: {
+    id: 'narukamis_joy',
+    name: "Narukami's Joy",
+    day: ['tuesday', 'friday'],
+    rarity: 2,
+    parent: 'narukamis_wisdom',
+  },
+  narukamis_affection: {
+    id: 'narukamis_affection',
+    name: "Narukami's Affection",
+    day: ['tuesday', 'friday'],
+    rarity: 3,
+    parent: 'narukamis_wisdom',
+  },
+  narukamis_valor: {
+    id: 'narukamis_valor',
+    name: "Narukami's Valor",
+    day: ['tuesday', 'friday'],
+    rarity: 4,
+    parent: 'narukamis_wisdom',
+  },
+
+  mask_of_the_wicked_lieutenant: {
+    id: 'mask_of_the_wicked_lieutenant',
+    name: 'Mask of the Wicked Lieutenant',
+    day: ['wednesday', 'saturday'],
+    rarity: 1,
+  },
+  mask_of_the_tigers_bite: {
+    id: 'mask_of_the_tigers_bite',
+    name: "Mask of the Tiger's Bite",
+    day: ['wednesday', 'saturday'],
+    rarity: 2,
+    parent: 'mask_of_the_wicked_lieutenant',
+  },
+  mask_of_the_one_horned: {
+    id: 'mask_of_the_one_horned',
+    name: 'Mask of the One-Horned',
+    day: ['wednesday', 'saturday'],
+    rarity: 3,
+    parent: 'mask_of_the_wicked_lieutenant',
+  },
+  mask_of_the_kijin: {
+    id: 'mask_of_the_kijin',
+    name: 'Mask of the Kijin',
+    day: ['wednesday', 'saturday'],
+    rarity: 4,
+    parent: 'mask_of_the_wicked_lieutenant',
+  },
+
+  teachings_of_transience: {
+    id: 'teachings_of_transience',
+    name: 'Teachings of Transience',
+    day: ['monday', 'thursday'],
+    rarity: 1,
+  },
+  guide_to_transience: {
+    id: 'guide_to_transience',
+    name: 'Guide to Transience',
+    day: ['monday', 'thursday'],
+    rarity: 2,
+    parent: 'teachings_of_transience',
+  },
+  philosophies_of_transience: {
+    id: 'philosophies_of_transience',
+    name: 'Philosophies of Transience',
+    day: ['monday', 'thursday'],
+    rarity: 3,
+    parent: 'guide_to_transience',
+  },
+
+  teachings_of_elegance: {
+    id: 'teachings_of_elegance',
+    name: 'Teachings of Elegance',
+    day: ['tuesday', 'friday'],
+    rarity: 1,
+  },
+  guide_to_elegance: {
+    id: 'guide_to_elegance',
+    name: 'Guide to Elegance',
+    day: ['tuesday', 'friday'],
+    rarity: 2,
+    parent: 'teachings_of_elegance',
+  },
+  philosophies_of_elegance: {
+    id: 'philosophies_of_elegance',
+    name: 'Philosophies of Elegance',
+    day: ['tuesday', 'friday'],
+    rarity: 3,
+    parent: 'teachings_of_elegance',
+  },
+
+  teachings_of_light: {
+    id: 'teachings_of_light',
+    name: 'Teachings of Light',
+    day: ['wednesday', 'saturday'],
+    rarity: 1,
+  },
+  guide_to_light: {
+    id: 'guide_to_light',
+    name: 'Guide to Light',
+    day: ['wednesday', 'saturday'],
+    rarity: 2,
+    parent: 'teachings_of_light',
+  },
+  philosophies_of_light: {
+    id: 'philosophies_of_light',
+    name: 'Philosophies of Light',
+    day: ['wednesday', 'saturday'],
+    rarity: 3,
+    parent: 'teachings_of_light',
+  },
+
+  perpetual_heart: { id: 'perpetual_heart', name: 'Perpetual Heart', rarity: 5 },
+  smoldering_pearl: { id: 'smoldering_pearl', name: 'Smoldering Pearl', rarity: 5 },
+
+  old_handguard: { id: 'old_handguard', name: 'Old Handguard' },
+  kageuchi_handguard: { id: 'kageuchi_handguard', name: 'Kageuchi Handguard' },
+  famed_handguard: { id: 'famed_handguard', name: 'Famed Handguard' },
+
   chaos_gear: { id: 'chaos_gear', name: 'Chaos Gear' },
   chaos_axis: { id: 'chaos_axis', name: 'Chaos Axis' },
   chaos_oculus: { id: 'chaos_oculus', name: 'Chaos Oculus' },
+
+  dismal_prism: { id: 'dismal_prism', name: 'Dismal Prism' },
+  crystal_prism: { id: 'crystal_prism', name: 'Crystal Prism' },
+  polarizing_prism: { id: 'polarizing_prism', name: 'Polarizing Prism' },
+
+  sakura_bloom: { id: 'sakura_bloom', name: 'Sakura Bloom' },
+  crystal_marrow: { id: 'crystal_marrow', name: 'Crystal Marrow' },
+  dendrobium: { id: 'dendrobium', name: 'Dendrobium' },
+  naku_weed: { id: 'naku_weed', name: 'Naku Weed' },
+  okinabuto: { id: 'okinabuto', name: 'Okinabuto' },
 };