From 5fbaa2efd1873a0efa1eee4e2d9bc2ff308a3091 Mon Sep 17 00:00:00 2001
From: FabianFG <mcdtloeser@gmail.com>
Date: Wed, 18 Mar 2020 18:35:11 +0100
Subject: [PATCH] support for series backgrounds, breaking:
 AthenaItemDefinition renamed to ItemDefinition to support more types

---
 .idea/workspace.xml                           |  46 +++--
 README.md                                     |   5 +-
 build.gradle                                  |   2 +-
 .../converters/fort/ItemDefinitions.kt        | 167 +++++++++++++++---
 .../fileprovider/FileProvider.kt              |   2 +-
 .../jfortniteparse/resources/Resources.kt     |   8 +-
 .../jfortniteparse/ue4/assets/Package.kt      |  19 +-
 ...enaItemDefinition.kt => ItemDefinition.kt} |  11 +-
 ...eroType.kt => FortItemSeriesDefinition.kt} |  23 ++-
 .../fort/FortWeaponMeleeItemDefinition.kt     |  30 ----
 10 files changed, 206 insertions(+), 107 deletions(-)
 rename src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/{athena/AthenaItemDefinition.kt => ItemDefinition.kt} (91%)
 rename src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/{FortHeroType.kt => FortItemSeriesDefinition.kt} (50%)
 delete mode 100644 src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortWeaponMeleeItemDefinition.kt

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c8e2c2c..2fcb0e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2ad0c40d-c758-4bfd-9c53-f11fecba01ab" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortItemSeriesDefinition.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/DefaultFileProvider.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/DefaultFileProvider.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/versions/Versions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/versions/Versions.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/athena/AthenaItemDefinition.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/ItemDefinition.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortHeroType.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortWeaponMeleeItemDefinition.kt" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,6 +28,9 @@
   <component name="CoverageViewManager">
     <option name="myElementSize" value="293" />
   </component>
+  <component name="DarkyenusTimeTracker">
+    <option name="totalTimeSeconds" value="7662" />
+  </component>
   <component name="DefaultGradleProjectSettings">
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
@@ -92,12 +100,14 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../AssetInspector" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../Desktop/Asval/SerieRarity/JFortniteParse-master/build.gradle" />
     <property name="nodejs_package_manager_path" value="npm" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
     <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
   </component>
   <component name="RecentsManager">
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="me.fungames.jfortniteparse.ue4.assets.exports" />
       <recent name="me.fungames.jfortniteparse.ue4.assets.reader" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -118,7 +128,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Gradle.JFortniteParse [bintrayUpload]">
+  <component name="RunManager" selected="Kotlin.TestKt (1)">
     <configuration name="JFortniteParse [bintrayUpload]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -294,7 +304,8 @@
       <workItem from="1584038169080" duration="3567000" />
       <workItem from="1584104811478" duration="96000" />
       <workItem from="1584111043505" duration="1648000" />
-      <workItem from="1584442030310" duration="665000" />
+      <workItem from="1584442030310" duration="1338000" />
+      <workItem from="1584544129230" duration="8575000" />
     </task>
     <task id="LOCAL-00001" summary="json exporting">
       <created>1572648237801</created>
@@ -534,7 +545,14 @@
       <option name="project" value="LOCAL" />
       <updated>1584114168662</updated>
     </task>
-    <option name="localTasksCounter" value="35" />
+    <task id="LOCAL-00035" summary="version is now a enum">
+      <created>1584442759046</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1584442759046</updated>
+    </task>
+    <option name="localTasksCounter" value="36" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -554,7 +572,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="locres texts are now in a mutable map" />
     <MESSAGE value="support for different versions and games, old code won't break anymore when something new is added" />
     <MESSAGE value="work for Fortnite Downloader (moved generic file provider functions into abstract file provider)" />
     <MESSAGE value="version bump" />
@@ -579,7 +596,8 @@
     <MESSAGE value="forgot version" />
     <MESSAGE value="obviously messed it up" />
     <MESSAGE value="added translated string to ftext serialization" />
-    <option name="LAST_COMMIT_MESSAGE" value="added translated string to ftext serialization" />
+    <MESSAGE value="version is now a enum" />
+    <option name="LAST_COMMIT_MESSAGE" value="version is now a enum" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -598,19 +616,9 @@
           <line>47</line>
           <option name="timeStamp" value="14" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt</url>
-          <line>91</line>
-          <option name="timeStamp" value="40" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt</url>
-          <line>93</line>
-          <option name="timeStamp" value="41" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="kotlin-line">
           <url>file://$PROJECT_DIR$/src/test/kotlin/Test.kt</url>
-          <line>65</line>
+          <line>61</line>
           <option name="timeStamp" value="42" />
         </line-breakpoint>
       </breakpoints>
diff --git a/README.md b/README.md
index eb67428..e6f67a7 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 ### An asset parser for ue4 assets for the jvm written in kotlin
 
-**Note: This project is 100% compatible and usable with java**
+**Note: This project is compatible and usable with java but you will need to use different methods**
 
 #### Features
 - Load ue4 pak files and provide ways to handle them
@@ -175,3 +175,6 @@ Texts will be exported with the hotfixed ones
 implementation 'me.fungames:JFortniteParseTextHotfixes:1.0'
 ```
 
+### Contributors
+- [Asval](https://github.com/iAmAsval)
+
diff --git a/build.gradle b/build.gradle
index 9cfa546..6a450cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group "me.fungames"
-version "2.3.7"
+version "2.4"
 
 repositories {
     mavenCentral()
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt b/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt
index 2d76f03..87cae12 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/converters/fort/ItemDefinitions.kt
@@ -12,25 +12,23 @@ import me.fungames.jfortniteparse.ue4.assets.FPackageIndex
 import me.fungames.jfortniteparse.ue4.assets.FText
 import me.fungames.jfortniteparse.ue4.assets.exports.UDataTable
 import me.fungames.jfortniteparse.ue4.assets.exports.UTexture2D
-import me.fungames.jfortniteparse.ue4.assets.exports.athena.AthenaItemDefinition
-import me.fungames.jfortniteparse.ue4.assets.exports.fort.FortHeroType
+import me.fungames.jfortniteparse.ue4.assets.exports.ItemDefinition
+import me.fungames.jfortniteparse.ue4.assets.exports.fort.FortItemSeriesDefinition
 import me.fungames.jfortniteparse.ue4.assets.exports.fort.FortMtxOfferData
-import me.fungames.jfortniteparse.ue4.assets.exports.fort.FortWeaponMeleeItemDefinition
 import me.fungames.jfortniteparse.ue4.locres.Locres
 import me.fungames.jfortniteparse.util.cut
 import me.fungames.jfortniteparse.util.drawCenteredString
 import me.fungames.jfortniteparse.util.scale
-import java.awt.Color
-import java.awt.Font
-import java.awt.FontMetrics
-import java.awt.RenderingHints
+import java.awt.*
 import java.awt.font.TextAttribute
+import java.awt.geom.AffineTransform
 import java.awt.image.BufferedImage
 import java.text.NumberFormat
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.min
+import kotlin.math.roundToInt
 
 object ItemDefinitionInfo {
     val sets = ConcurrentHashMap<String, FText>()
@@ -92,13 +90,15 @@ object ItemDefinitionInfo {
 }
 
 @Throws(ParserException::class)
-fun AthenaItemDefinition.createContainer(
+fun ItemDefinition.createContainer(
     fileProvider: FileProvider,
     loadVariants: Boolean = true, failOnNoIconLoaded: Boolean = false, overrideIcon: BufferedImage? = null
 ): ItemDefinitionContainer {
     ItemDefinitionInfo.init(fileProvider)
     val icon = overrideIcon ?: loadIcon(this, fileProvider)
         ?: if (failOnNoIconLoaded) throw ParserException("Failed to load icon") else Resources.fallbackIcon
+    val seriesDef = series?.let { loadSeriesDef(it, fileProvider) }
+    val seriesIcon = seriesDef?.backgroundTexture?.let { fileProvider.loadGameFile(it)?.getExportOfTypeOrNull<UTexture2D>()?.toBufferedImage() }
     if (loadVariants) {
         this.variants.forEach { variants ->
             variants.variants.forEach {
@@ -113,7 +113,7 @@ fun AthenaItemDefinition.createContainer(
     val setName = this.set
     if (setName != null)
         setText = ItemDefinitionInfo.sets[setName.text]
-    return ItemDefinitionContainer(this, icon, setText)
+    return ItemDefinitionContainer(this, icon, setText, seriesIcon, seriesDef)
 }
 data class SetName(val set : FText, val wrapper : FText = FText("Fort.Cosmetics", "CosmeticItemDescription_SetMembership", "Part of the <SetName>{0}</> set.")) {
     fun applyLocres(locres: Locres?) {
@@ -124,7 +124,7 @@ data class SetName(val set : FText, val wrapper : FText = FText("Fort.Cosmetics"
     val finalText : String
         get() = wrapper.text.replace("<SetName>{0}</>", set.text)
 }
-class ItemDefinitionContainer(val itemDefinition: AthenaItemDefinition, var icon: BufferedImage, setText : FText?) : Cloneable {
+class ItemDefinitionContainer(val itemDefinition: ItemDefinition, var icon: BufferedImage, setText : FText?, var seriesIcon : BufferedImage?, var seriesDef : FortItemSeriesDefinition?) : Cloneable {
 
     var setName = setText?.let { SetName(setText) }
 
@@ -165,13 +165,16 @@ private fun getImageWithVariants(container: ItemDefinitionContainer): BufferedIm
             variantsIconSize,
             variantsIconSize
         )
-
     val rarity = itemDef.rarity.getVariantsBackgroundImage()
     val result = BufferedImage(rarity.width, rarity.height, BufferedImage.TYPE_INT_ARGB)
     val g = result.createGraphics()
     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
     g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY)
-    g.drawImage(rarity, 0, 0, null)
+
+    if (!drawSeriesBackgroundColors(result, g, container, isFeaturedShop = false, isDailyShop = false)) {
+        g.drawImage(rarity, 0, 0, null)
+    }
+    drawSeriesBackgroundImage(result, g, container, false)
 
     val burbank = Resources.burbank
     val notoSans = Resources.notoSans
@@ -223,7 +226,15 @@ private fun getImageWithVariants(container: ItemDefinitionContainer): BufferedIm
                 cX = variantsBeginX
                 cY += varSize + variantsSpaceBetween
             }
-            g.paint = Color(255, 255, 255, 70)
+            //draw variant background with Color1
+            val color1 = container.seriesDef?.colors?.get("Color1")
+            if (color1 != null) {
+                val r = color1.r.times(255).roundToInt()
+                val gr = color1.g.times(255).roundToInt()
+                val b = color1.b.times(255).roundToInt()
+                g.paint = Color(r, gr, b, 70)
+            }
+            else g.paint = Color(255, 255, 255, 70)
             g.fillRect(cX, cY, varSize, varSize)
             g.drawImage(varIcon, cX, cY, null)
 
@@ -319,7 +330,12 @@ private fun getImageNoVariants(container: ItemDefinitionContainer): BufferedImag
     val g = result.createGraphics()
     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
     g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY)
-    g.drawImage(rarity, 0, 0, null)
+
+    if (!drawSeriesBackgroundColors(result, g, container, isFeaturedShop = false, isDailyShop = false)) {
+        g.drawImage(rarity, 0, 0, null)
+    }
+    drawSeriesBackgroundImage(result, g, container, false)
+
     g.drawImage(icon, 5, 5, null)
 
     val burbank = Resources.burbank
@@ -358,7 +374,6 @@ private fun getImageNoVariants(container: ItemDefinitionContainer): BufferedImag
             lines = lines.subList(0, 2)
             UEClass.logger.warn("Dropped ${lines.size - 2} description line(s)")
         }
-        // TODO Sets
 
         lines.forEach {
             fontSize = 25f
@@ -397,7 +412,12 @@ private fun getShopFeaturedImage(container: ItemDefinitionContainer, price: Int)
     val g = result.createGraphics()
     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
     g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY)
-    g.drawImage(rarity, 0, 0, null)
+
+    if (!drawSeriesBackgroundColors(result, g, container, isFeaturedShop = true, isDailyShop = false)) {
+        g.drawImage(rarity, 0, 0, null)
+    }
+
+    drawSeriesBackgroundImage(result, g, container, true)
     g.drawImage(icon.cut(result.width - 22), 11, 11, null)
 
     g.paint = Color(0, 0, 0, 100)
@@ -433,7 +453,22 @@ private fun getShopFeaturedImage(container: ItemDefinitionContainer, price: Int)
             g.font = notoSans.deriveFont(Font.PLAIN, fontSize).deriveFont(trackingAttr)
             fm = g.fontMetrics
         }
-        g.drawCenteredString(shortDesc, result.width / 2, icon.height - 20)
+        //draw series name with Color1
+        val color1 = container.seriesDef?.colors?.get("Color1")
+        val seriesDisplayName = container.seriesDef?.displayName
+        if (color1 != null && seriesDisplayName != null) {
+            val r = color1.r.times(255).roundToInt()
+            val gr = color1.g.times(255).roundToInt()
+            val b = color1.b.times(255).roundToInt()
+            g.color = Color(r, gr,b)
+            g.font = notoSans.deriveFont(Font.BOLD, fontSize).deriveFont(trackingAttr)
+            val stringWidth = g.fontMetrics.stringWidth(seriesDisplayName.text)
+            val serieX = (result.width / 2 - (stringWidth / 2)) + 20
+            g.drawCenteredString(seriesDisplayName.text.toUpperCase(), serieX, icon.height - 20)
+            g.color = Color.LIGHT_GRAY
+            g.font = notoSans.deriveFont(Font.PLAIN, fontSize).deriveFont(trackingAttr)
+            g.drawString(shortDesc, serieX + 60 + (stringWidth / 2), icon.height - 20)
+        } else g.drawCenteredString(shortDesc, result.width / 2, icon.height - 20)
     }
 
     g.font = notoSansBold.deriveFont(Font.PLAIN, 60f)
@@ -462,7 +497,10 @@ private fun getShopDailyImage(container: ItemDefinitionContainer, price: Int): B
     val g = result.createGraphics()
     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)
     g.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY)
-    g.drawImage(rarity, 0, 0, null)
+    if (!drawSeriesBackgroundColors(result, g, container, isFeaturedShop = false, isDailyShop = true)) {
+        g.drawImage(rarity, 0, 0, null)
+    }
+    drawSeriesBackgroundImage(result, g, container, false)
     g.drawImage(icon, 5, 5, null)
 
     val burbank = Resources.burbank
@@ -491,7 +529,7 @@ private fun getShopDailyImage(container: ItemDefinitionContainer, price: Int): B
     val shortDesc = itemDef.shortDescription?.text
     if (shortDesc != null) {
         g.color = Color.LIGHT_GRAY
-        var fontSize = 40f
+        var fontSize = 30f
         g.font = notoSans.deriveFont(Font.PLAIN, fontSize).deriveFont(trackingAttr)
         var fm = g.fontMetrics
         while (fm.stringWidth(shortDesc) > result.width - 10) {
@@ -499,7 +537,24 @@ private fun getShopDailyImage(container: ItemDefinitionContainer, price: Int): B
             g.font = notoSans.deriveFont(Font.PLAIN, fontSize).deriveFont(trackingAttr)
             fm = g.fontMetrics
         }
-        g.drawCenteredString(shortDesc, result.width / 2, icon.height - 20)
+
+
+        //draw series name with Color1
+        val color1 = container.seriesDef?.colors?.get("Color1")
+        val seriesDisplayName = container.seriesDef?.displayName
+        if (color1 != null && seriesDisplayName != null) {
+            val r = color1.r.times(255).roundToInt()
+            val gr = color1.g.times(255).roundToInt()
+            val b = color1.b.times(255).roundToInt()
+            g.color = Color(r, gr,b)
+            g.font = notoSans.deriveFont(Font.BOLD, fontSize).deriveFont(trackingAttr)
+            val stringWidth = g.fontMetrics.stringWidth(seriesDisplayName.text)
+            val serieX = (result.width / 2 - (stringWidth / 2)) + 20
+            g.drawCenteredString(seriesDisplayName.text.toUpperCase(), serieX, icon.height - 20)
+            g.color = Color.LIGHT_GRAY
+            g.font = notoSans.deriveFont(Font.PLAIN, fontSize).deriveFont(trackingAttr)
+            g.drawString(shortDesc, serieX + 40 + (stringWidth / 2), icon.height - 20)
+        } else g.drawCenteredString(shortDesc, result.width / 2, icon.height - 20)
     }
 
     g.font = notoSansBold.deriveFont(Font.PLAIN, 45f)
@@ -520,7 +575,7 @@ private fun getShopDailyImage(container: ItemDefinitionContainer, price: Int): B
 private val numberFormatter: NumberFormat by lazy { NumberFormat.getNumberInstance(Locale.US) }
 private fun printPrice(price: Int) = numberFormatter.format(price)
 
-private fun loadFeaturedIcon(itemDefinition: AthenaItemDefinition, fileProvider: FileProvider): BufferedImage? {
+private fun loadFeaturedIcon(itemDefinition: ItemDefinition, fileProvider: FileProvider): BufferedImage? {
     if (itemDefinition.usesDisplayAssetPath) {
         val pkg = fileProvider.loadGameFile(itemDefinition.displayAssetPath!!) ?: return null
         val offerData = pkg.getExportOfTypeOrNull<FortMtxOfferData>() ?: return null
@@ -533,7 +588,7 @@ private fun loadFeaturedIcon(itemDefinition: AthenaItemDefinition, fileProvider:
         return null
 }
 
-private fun loadNormalIcon(itemDefinition: AthenaItemDefinition, fileProvider: FileProvider): BufferedImage? {
+private fun loadNormalIcon(itemDefinition: ItemDefinition, fileProvider: FileProvider): BufferedImage? {
     if (itemDefinition.hasIcons) {
         val iconPkg = fileProvider.loadGameFile(itemDefinition.largePreviewImage!!)
         val icon = iconPkg?.getExportOfType<UTexture2D>()?.toBufferedImage()
@@ -542,9 +597,9 @@ private fun loadNormalIcon(itemDefinition: AthenaItemDefinition, fileProvider: F
     }
     if (itemDefinition.usesHeroDefinition) {
         val heroDefPkg = fileProvider.loadGameFile(itemDefinition.heroDefinitionPackage!!)
-        val hero = heroDefPkg?.getExportOfTypeOrNull<FortHeroType>()
-        if (hero != null) {
-            val iconPkg = fileProvider.loadGameFile(hero.largePreviewImage)
+        val largePreviewImage = heroDefPkg?.getExportOfTypeOrNull<ItemDefinition>()?.largePreviewImage
+        if (largePreviewImage != null) {
+            val iconPkg = fileProvider.loadGameFile(largePreviewImage)
             val icon = iconPkg?.getExportOfType<UTexture2D>()?.toBufferedImage()
             if (icon != null)
                 return icon
@@ -552,9 +607,9 @@ private fun loadNormalIcon(itemDefinition: AthenaItemDefinition, fileProvider: F
     }
     if (itemDefinition.usesWeaponDefinition) {
         val weaponDefPkg = fileProvider.loadGameFile(itemDefinition.weaponDefinitionPackage!!)
-        val weapon = weaponDefPkg?.getExportOfTypeOrNull<FortWeaponMeleeItemDefinition>()
-        if (weapon != null) {
-            val iconPkg = fileProvider.loadGameFile(weapon.largePreviewImage)
+        val largePreviewImage = weaponDefPkg?.getExportOfTypeOrNull<ItemDefinition>()?.largePreviewImage
+        if (largePreviewImage != null) {
+            val iconPkg = fileProvider.loadGameFile(largePreviewImage)
             val icon = iconPkg?.getExportOfType<UTexture2D>()?.toBufferedImage()
             if (icon != null)
                 return icon
@@ -563,6 +618,60 @@ private fun loadNormalIcon(itemDefinition: AthenaItemDefinition, fileProvider: F
     return null
 }
 
-private fun loadIcon(itemDefinition: AthenaItemDefinition, fileProvider: FileProvider) =
+private fun loadIcon(itemDefinition: ItemDefinition, fileProvider: FileProvider) =
     loadFeaturedIcon(itemDefinition, fileProvider)
         ?: loadNormalIcon(itemDefinition, fileProvider)
+
+private fun loadSeriesDef(index : FPackageIndex, fileProvider: FileProvider) = fileProvider.loadGameFile(index)?.getExportOfTypeOrNull<FortItemSeriesDefinition>()
+
+private fun drawSeriesBackgroundColors(result : BufferedImage, g : Graphics2D, container: ItemDefinitionContainer, isFeaturedShop : Boolean, isDailyShop : Boolean) : Boolean {
+    val seriesDef = container.seriesDef ?: return false
+    val color1 = seriesDef.colors["Color1"] ?: return false
+    val color2 = seriesDef.colors["Color2"] ?: return false
+    val color3 = seriesDef.colors["Color3"] ?: return false
+
+    val r = color1.r.times(255).roundToInt()
+    val gr = color1.g.times(255).roundToInt()
+    val b = color1.b.times(255).roundToInt()
+    val r2 = color2.r.times(255).roundToInt()
+    val gr2 = color2.g.times(255).roundToInt()
+    val b2 = color2.b.times(255).roundToInt()
+    val r3 = color3.r.times(255).roundToInt()
+    val gr3 = color3.g.times(255).roundToInt()
+    val b3 = color3.b.times(255).roundToInt()
+
+    //gradient borders
+    val baseT = g.transform
+    val tf = AffineTransform.getTranslateInstance((-result.width / 2).toDouble(), (-result.height / 2).toDouble())
+    tf.preConcatenate(AffineTransform.getRotateInstance(Math.toRadians(180.0 + 45.0)))
+    tf.preConcatenate(AffineTransform.getTranslateInstance((result.width / 2).toDouble(), (result.height / 2).toDouble()))
+    g.transform = tf
+    g.paint = GradientPaint(0F, 0F, Color(r2, gr2, b2), 0F, (result.height + result.width).toFloat(), Color(r, gr, b), false)
+    g.fillRect(-result.width / 2, -result.height / 2, result.width * 2, result.height * 2)
+    g.transform = baseT
+
+    //actual background (you see it with the marvel rarity)
+    g.paint = Color(r3, gr3, b3)
+    if (isFeaturedShop)
+        g.fillRect(10, 10, result.width - 20, result.height - 20)
+    else
+        g.fillRect(5, 5, result.width - 10, result.height - 10)
+
+    if (isFeaturedShop) {
+        g.paint = Color(0, 7, 36, 255)
+        g.fillRect(10, result.height - 20 - 122, result.width - 20, 132)
+    } else if(isDailyShop) {
+        g.paint = Color(0, 7, 36, 255)
+        g.fillRect(5, result.height - 10 - 78, result.width - 10, 83)
+    }
+    return true
+}
+
+private fun drawSeriesBackgroundImage(result: BufferedImage, g: Graphics2D, container: ItemDefinitionContainer, isFeatured : Boolean) : Boolean {
+    val seriesIcon = container.seriesIcon ?: return false
+    if (isFeatured)
+        g.drawImage(seriesIcon.scale(result.width - 20, result.height - 20 - 132), 10, 10, null)
+    else
+        g.drawImage(seriesIcon, 5, 5, null)
+    return true
+}
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt b/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt
index 01f44a4..fcff18b 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/fileprovider/FileProvider.kt
@@ -144,7 +144,7 @@ interface FileProvider {
         if (path.startsWith('/'))
             path = path.substring(1)
         val lastPart = path.substringAfterLast('/')
-        if (lastPart.contains('.') && lastPart.substringBefore('.') == lastPart.substringAfter('.'))
+        if (lastPart.contains('.')/* && lastPart.substringBefore('.') == lastPart.substringAfter('.')*/)
             path = path.substringBeforeLast('/') + "/" + lastPart.substringBefore('.')
         if (!path.endsWith('/') && !path.substringAfterLast('/').contains('.'))
             path += ".uasset"
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt b/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt
index 237dcb1..2810743 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/resources/Resources.kt
@@ -47,13 +47,13 @@ object Resources {
         ?: throw IllegalStateException("Failed to load a resource") }
 
     // Legendary Rarity
-    val legendaryBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/E512.png"))
+    val legendaryBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/L512.png"))
         ?: throw IllegalStateException("Failed to load a resource") }
-    val legendaryVariantsBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/vE512.png"))
+    val legendaryVariantsBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/vL512.png"))
         ?: throw IllegalStateException("Failed to load a resource") }
-    val legendaryDailyShopBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/EDail.png"))
+    val legendaryDailyShopBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/LDail.png"))
         ?: throw IllegalStateException("Failed to load a resource") }
-    val legendaryFeaturedShopBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/EFeat.png"))
+    val legendaryFeaturedShopBackground : BufferedImage by lazy { ImageIO.read(Resources.javaClass.getResourceAsStream("/icons/LFeat.png"))
         ?: throw IllegalStateException("Failed to load a resource") }
 
     // Mythic Rarity
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt
index a52fd48..4e0c594 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/Package.kt
@@ -6,15 +6,13 @@ import com.google.gson.GsonBuilder
 import me.fungames.jfortniteparse.exceptions.ParserException
 import me.fungames.jfortniteparse.ue4.UEClass.Companion.logger
 import me.fungames.jfortniteparse.ue4.assets.exports.*
-import me.fungames.jfortniteparse.ue4.assets.exports.athena.AthenaItemDefinition
+import me.fungames.jfortniteparse.ue4.assets.exports.ItemDefinition
 import me.fungames.jfortniteparse.ue4.assets.exports.fort.*
 import me.fungames.jfortniteparse.ue4.assets.util.PayloadType
 import me.fungames.jfortniteparse.ue4.assets.reader.FAssetArchive
 import me.fungames.jfortniteparse.ue4.assets.writer.FAssetArchiveWriter
 import me.fungames.jfortniteparse.ue4.assets.writer.FByteArrayArchiveWriter
 import me.fungames.jfortniteparse.ue4.locres.Locres
-import me.fungames.jfortniteparse.ue4.versions.GAME_UE4
-import me.fungames.jfortniteparse.ue4.versions.LATEST_SUPPORTED_UE4_VERSION
 import me.fungames.jfortniteparse.ue4.versions.Ue4Version
 import java.io.File
 import java.io.OutputStream
@@ -101,13 +99,18 @@ class Package(uasset : ByteArray, uexp : ByteArray, ubulk : ByteArray? = null, n
                 "DataTable" -> exports.add(UDataTable(uexpAr, it))
                 "CurveTable" -> exports.add(UCurveTable(uexpAr, it))
                 "FortMtxOfferData" -> exports.add(FortMtxOfferData(uexpAr, it))
-                "FortHeroType" -> exports.add(FortHeroType(uexpAr, it))
-                "FortWeaponMeleeItemDefinition" -> exports.add(FortWeaponMeleeItemDefinition(uexpAr, it))
                 "FortItemCategory" -> exports.add(FortItemCategory(uexpAr, it))
                 "CatalogMessaging" -> exports.add(FortCatalogMessaging(uexpAr, it))
+                "FortItemSeriesDefinition" -> exports.add(FortItemSeriesDefinition(uexpAr, it))
+                "AthenaItemWrapDefinition", "FortBannerTokenType",
+                "FortVariantTokenType", "FortHeroType",
+                "FortTokenType", "FortWorkerType",
+                "FortDailyRewardScheduleTokenDefinition",
+                "FortAbilityKit" -> exports.add(ItemDefinition(uexpAr, it))
                 else -> {
-                    if ((exportType.startsWith("Athena") && exportType.endsWith("ItemDefinition")) || exportType == "AthenaItemWrapDefinition" || exportType == "FortBannerTokenType") {
-                        exports.add(AthenaItemDefinition(uexpAr, it))
+                    if (exportType.contains("ItemDefinition")) {
+                        exports.add(ItemDefinition(uexpAr, it)
+                        )
                     } else if (exportType.startsWith("FortCosmetic") && exportType.endsWith("Variant")) {
                         val variant = FortCosmeticVariant(uexpAr, it)
                         matchItemDefAndVariant(variant)
@@ -126,7 +129,7 @@ class Package(uasset : ByteArray, uexp : ByteArray, ubulk : ByteArray? = null, n
     }
 
     private fun matchItemDefAndVariant(variant: FortCosmeticVariant) {
-        val itemDef = getExportOfTypeOrNull<AthenaItemDefinition>() ?: return
+        val itemDef = getExportOfTypeOrNull<ItemDefinition>() ?: return
         itemDef.variants.add(variant)
     }
 
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/athena/AthenaItemDefinition.kt b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/ItemDefinition.kt
similarity index 91%
rename from src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/athena/AthenaItemDefinition.kt
rename to src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/ItemDefinition.kt
index 62da700..545e690 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/athena/AthenaItemDefinition.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/ItemDefinition.kt
@@ -1,7 +1,6 @@
-package me.fungames.jfortniteparse.ue4.assets.exports.athena
+package me.fungames.jfortniteparse.ue4.assets.exports
 
 import me.fungames.jfortniteparse.ue4.assets.*
-import me.fungames.jfortniteparse.ue4.assets.exports.UEExport
 import me.fungames.jfortniteparse.ue4.assets.exports.fort.EFortRarity
 import me.fungames.jfortniteparse.ue4.assets.exports.fort.FortCosmeticVariant
 import me.fungames.jfortniteparse.ue4.assets.util.FName
@@ -10,7 +9,7 @@ import me.fungames.jfortniteparse.ue4.assets.writer.FAssetArchiveWriter
 import me.fungames.jfortniteparse.ue4.locres.Locres
 
 @ExperimentalUnsignedTypes
-class AthenaItemDefinition : UEExport {
+class ItemDefinition : UEExport {
     override var baseObject: UObject
 
     var heroDefinitionPackage : FPackageIndex? = null
@@ -31,6 +30,7 @@ class AthenaItemDefinition : UEExport {
         get() = displayAssetPath != null
 
     var rarity : EFortRarity = EFortRarity.Uncommon
+    var series : FPackageIndex? = null
 
     var displayName : FText? = null
     var shortDescription : FText? = null
@@ -46,8 +46,8 @@ class AthenaItemDefinition : UEExport {
 
     var variants = mutableListOf<FortCosmeticVariant>()
 
-    constructor() : super("AthenaItemDefinition") {
-        baseObject = UObject(mutableListOf(), false, null, "AthenaItemDefinition")
+    constructor() : super("ItemDefinition") {
+        baseObject = UObject(mutableListOf(), false, null, "ItemDefinition")
         gameplayTags = FGameplayTagContainer(mutableListOf())
     }
 
@@ -60,6 +60,7 @@ class AthenaItemDefinition : UEExport {
         largePreviewImage = baseObject.getOrNull("LargePreviewImage") ?: baseObject.getOrNull("SpriteSheet")
         displayAssetPath = baseObject.getOrNull("DisplayAssetPath")
         rarity = EFortRarity.getEnum(baseObject.getOrNull<FName>("Rarity")?.text)
+        series = baseObject.getOrNull("Series")
         displayName = baseObject.getOrNull("DisplayName")
         shortDescription = baseObject.getOrNull("ShortDescription")
         description = baseObject.getOrNull("Description")
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortHeroType.kt b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortItemSeriesDefinition.kt
similarity index 50%
rename from src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortHeroType.kt
rename to src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortItemSeriesDefinition.kt
index a708cb4..9293ed9 100644
--- a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortHeroType.kt
+++ b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortItemSeriesDefinition.kt
@@ -1,24 +1,25 @@
 package me.fungames.jfortniteparse.ue4.assets.exports.fort
 
-import me.fungames.jfortniteparse.ue4.assets.FObjectExport
-import me.fungames.jfortniteparse.ue4.assets.FSoftObjectPath
-import me.fungames.jfortniteparse.ue4.assets.UObject
+import me.fungames.jfortniteparse.ue4.assets.*
 import me.fungames.jfortniteparse.ue4.assets.exports.UEExport
 import me.fungames.jfortniteparse.ue4.assets.reader.FAssetArchive
 import me.fungames.jfortniteparse.ue4.assets.writer.FAssetArchiveWriter
+import me.fungames.jfortniteparse.ue4.locres.Locres
 
 @ExperimentalUnsignedTypes
-class FortHeroType : UEExport {
+class FortItemSeriesDefinition : UEExport {
     override var baseObject: UObject
-    var largePreviewImage : FSoftObjectPath
-    var smallPreviewImage : FSoftObjectPath
-    // has more properties, just images needed for now
+
+    var displayName : FText? = null
+    var colors : Map<String, FLinearColor>
+    var backgroundTexture : FSoftObjectPath? = null
 
     constructor(Ar: FAssetArchive, exportObject: FObjectExport) : super(exportObject) {
         super.init(Ar)
         baseObject = UObject(Ar, exportObject)
-        largePreviewImage = baseObject.get("LargePreviewImage")
-        smallPreviewImage = baseObject.get("SmallPreviewImage")
+        displayName = baseObject.getOrNull("DisplayName")
+        colors = baseObject.get<FStructFallback>("Colors").properties.associateBy { it.name.text }.mapValues { it.value.getTagTypeValue() as FLinearColor }
+        backgroundTexture = baseObject.getOrNull("BackgroundTexture")
         super.complete(Ar)
     }
 
@@ -27,4 +28,8 @@ class FortHeroType : UEExport {
         baseObject.serialize(Ar)
         super.completeWrite(Ar)
     }
+
+    override fun applyLocres(locres : Locres?) {
+        displayName?.applyLocres(locres)
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortWeaponMeleeItemDefinition.kt b/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortWeaponMeleeItemDefinition.kt
deleted file mode 100644
index ef91719..0000000
--- a/src/main/kotlin/me/fungames/jfortniteparse/ue4/assets/exports/fort/FortWeaponMeleeItemDefinition.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.fungames.jfortniteparse.ue4.assets.exports.fort
-
-import me.fungames.jfortniteparse.ue4.assets.FObjectExport
-import me.fungames.jfortniteparse.ue4.assets.FSoftObjectPath
-import me.fungames.jfortniteparse.ue4.assets.UObject
-import me.fungames.jfortniteparse.ue4.assets.exports.UEExport
-import me.fungames.jfortniteparse.ue4.assets.reader.FAssetArchive
-import me.fungames.jfortniteparse.ue4.assets.writer.FAssetArchiveWriter
-
-@ExperimentalUnsignedTypes
-class FortWeaponMeleeItemDefinition : UEExport {
-    override var baseObject: UObject
-    var largePreviewImage : FSoftObjectPath
-    var smallPreviewImage : FSoftObjectPath
-    // has more properties, just images needed for now
-
-    constructor(Ar: FAssetArchive, exportObject: FObjectExport) : super(exportObject) {
-        super.init(Ar)
-        baseObject = UObject(Ar, exportObject)
-        largePreviewImage = baseObject.get("LargePreviewImage")
-        smallPreviewImage = baseObject.get("SmallPreviewImage")
-        super.complete(Ar)
-    }
-
-    override fun serialize(Ar: FAssetArchiveWriter) {
-        super.initWrite(Ar)
-        baseObject.serialize(Ar)
-        super.completeWrite(Ar)
-    }
-}
\ No newline at end of file