Update winter event 2023

ProjectCeleste · Dec 19, 2023 · 7d73314 · 7d73314
1 parent 4f07b22
commit 7d73314
Show file tree

Hide file tree

Showing 12 changed files with 472 additions and 456 deletions.
diff --git a/db/advisors/build.ts b/db/advisors/build.ts
@@ -1,7 +1,7 @@
 import { merge } from "lodash"
 
 import { API, downloadIcon } from "../download"
-import { Advisor, Vendor } from "../interfaces"
+import { Advisor } from "../interfaces"
 import { translateEn, convertCivilization } from "../shared/convert-text"
 import { findVendors } from "../vendors"
 

diff --git a/db/items/convert-event.ts b/db/items/convert-event.ts
@@ -25,6 +25,7 @@ import {
 
   //no summer 2023
   isHalloween2023Reward,
+  isWinter2023Reward,
 } from "./source"
 
 export function convertEvent(trait: Trait): Item["event"] | undefined {
@@ -132,4 +133,11 @@ export function convertEvent(trait: Trait): Item["event"] | undefined {
       year: 2023,
     }
   }
+
+  if (isWinter2023Reward(trait)) {
+    return {
+      name: "winter",
+      year: 2023,
+    }
+  }
 }
diff --git a/db/items/convert.ts b/db/items/convert.ts
@@ -29,7 +29,8 @@ export async function convertItem(trait: Trait): Promise<Item> {
   const name = await translateEn(trait.displaynameid, trait.name)
   const type = await translateEn(trait.rollovertextid, "")
   const icon = await downloadIcon(`Art/${trait.icon}`, "items")
-
+
+
   var visualfactor_text = ''
 
   if (trait.traittype === "VanityHelm" || trait.traittype === "VanityShield" || trait.traittype === "VanityWeapon")  {

diff --git a/db/items/source.ts b/db/items/source.ts
@@ -267,6 +267,11 @@ export function isHalloween2023Reward(trait: Trait) {
   return trait.name.endsWith("_halloween2023")
 }
 
+export function isWinter2023Reward(trait: Trait) {
+  return trait.name.endsWith("_winter2023")
+}
+
+
 export function isEventReward(trait: Trait) {
   return isHalloween2018Reward(trait)
     //|| isWinterReward(trait)
@@ -285,6 +290,7 @@ export function isEventReward(trait: Trait) {
     || isWinter2022Reward(trait)
     //no new summer 2023
     || isHalloween2023Reward(trait)
+    || isWinter2023Reward(trait)
 }
 
 export function isBahramReward(trait: Trait) {

diff --git a/db/shared/convert-text.ts b/db/shared/convert-text.ts
@@ -24,7 +24,7 @@ export async function translateEn(id: number, fallback?: string) {
 
 export function cleanFormat(translation: string) {
   return translation ? 
-    translation.replace(/\\n/g, "\n").replace(/<color="(.*?)">(.*?)<\/color>/g, "$2"):
+    translation.replace(/\\n/g, "\n").replace(/<color="(.*?)">(.*?)<\/color>/g, "$2").replace(/<color=(.*?)>/g, "- ").replace(/<\/color>/g,""):
     translation
 }
 

diff --git a/src/assets/db/blueprints.json b/src/assets/db/blueprints.json
diff --git a/src/assets/db/designs.json b/src/assets/db/designs.json
diff --git a/src/assets/db/items.json b/src/assets/db/items.json
diff --git a/src/assets/db/materials.json b/src/assets/db/materials.json
diff --git a/src/assets/sprites/items.png b/src/assets/sprites/items.png
diff --git a/src/assets/sprites/items.scss b/src/assets/sprites/items.scss
diff --git a/src/assets/sprites/items.webp b/src/assets/sprites/items.webp