Fix on Items Tier

opentibiabr · Jan 25, 2024 · 48f2420 · 48f2420
1 parent 28dbaef
commit 48f2420
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 31 deletions.
diff --git a/data-canary/scripts/item_classification/item_tiers.lua b/data-canary/scripts/item_classification/item_tiers.lua
@@ -6,86 +6,110 @@ local itemTierClassifications = {
 			regular = 25000,
 			core = 1,
 		},
+		[2] = {
+			regular = 50000,
+			core = 1,
+		},
+		[3] = {
+			regular = 100000,
+			core = 1,
+		},
 	},
 	-- Upgrade classification 2
 	[2] = {
 		-- Update tier 0
 		[1] = {
-			regular = 750000,
+			regular = 50000,
 			core = 1,
 		},
 		-- Update tier 1
 		[2] = {
-			regular = 5000000,
+			regular = 100000,
 			core = 1,
 		},
+		[3] = {
+			regular = 200000,
+			core = 2,
+		},
+		[4] = {
+			regular = 400000,
+			core = 2,
+		},
 	},
 	-- Upgrade classification 3
 	[3] = {
 		[1] = {
-			regular = 4000000,
+			regular = 200000,
 			core = 1,
 		},
 		[2] = {
-			regular = 10000000,
-			core = 1,
+			regular = 400000,
+			core = 2,
 		},
 		[3] = {
-			regular = 20000000,
-			core = 2,
+			regular = 800000,
+			core = 3,
+		},
+		[4] = {
+			regular = 1600000,
+			core = 4,
+		},
+		[5] = {
+			regular = 3200000,
+			core = 5,
 		},
 	},
 	-- Upgrade classification 4
 	[4] = {
 		[1] = {
-			regular = 8000000,
+			regular = 1500000,
 			core = 1,
-			convergence = { fusion = { price = 55000000 }, transfer = { price = 65000000 } },
+			convergence = { fusion = { price = 6000000 }, transfer = { price = 12000000 } },
 		},
 		[2] = {
-			regular = 20000000,
+			regular = 3000000,
 			core = 2,
-			convergence = { fusion = { price = 110000000 }, transfer = { price = 165000000 } },
+			convergence = { fusion = { price = 12000000 }, transfer = { price = 24000000 } },
 		},
 		[3] = {
-			regular = 40000000,
+			regular = 6000000,
 			core = 5,
-			convergence = { fusion = { price = 170000000 }, transfer = { price = 375000000 } },
+			convergence = { fusion = { price = 24000000 }, transfer = { price = 48000000 } },
 		},
 		[4] = {
-			regular = 65000000,
+			regular = 15000000,
 			core = 10,
-			convergence = { fusion = { price = 300000000 }, transfer = { price = 800000000 } },
+			convergence = { fusion = { price = 48000000 }, transfer = { price = 100000000 } },
 		},
 		[5] = {
-			regular = 100000000,
+			regular = 30000000,
 			core = 15,
-			convergence = { fusion = { price = 875000000 }, transfer = { price = 2000000000 } },
+			convergence = { fusion = { price = 100000000 }, transfer = { price = 200000000 } },
 		},
 		[6] = {
-			regular = 250000000,
+			regular = 80000000,
 			core = 25,
-			convergence = { fusion = { price = 2350000000 }, transfer = { price = 5250000000 } },
+			convergence = { fusion = { price = 200000000 }, transfer = { price = 400000000 } },
 		},
 		[7] = {
-			regular = 750000000,
+			regular = 200000000,
 			core = 35,
-			convergence = { fusion = { price = 6950000000 }, transfer = { price = 14500000000 } },
+			convergence = { fusion = { price = 400000000 }, transfer = { price = 800000000 } },
 		},
 		[8] = {
-			regular = 2500000000,
+			regular = 400000000,
 			core = 50,
-			convergence = { fusion = { price = 21250000000 }, transfer = { price = 42500000000 } },
+			convergence = { fusion = { price = 800000000 }, transfer = { price = 1600000000 } },
 		},
 		[9] = {
-			regular = 8000000000,
+			regular = 800000000,
 			core = 60,
-			convergence = { fusion = { price = 50000000000 }, transfer = { price = 100000000000 } },
+			convergence = { fusion = { price = 1600000000 }, transfer = { price = 3200000000 } },
 		},
 		[10] = {
-			regular = 15000000000,
+			regular = 1600000000,
 			core = 85,
-			convergence = { fusion = { price = 125000000000 }, transfer = { price = 300000000000 } },
+			convergence = { fusion = { price = 3200000000 }, transfer = { price = 6400000000 } },
 		},
 	},
 }
@@ -108,4 +132,4 @@ for classificationId, classificationTable in ipairs(itemTierClassifications) do
 	end
 	-- Create item classification and register classification table
 	itemClassification:register(classification)
-end
+end
diff --git a/data-canary/scripts/lib/register_item_tier.lua b/data-canary/scripts/lib/register_item_tier.lua
@@ -14,11 +14,12 @@ end
 registerItemClassification.Upgrades = function(itemClassification, mask)
 	if mask.Upgrades then
 		for _, value in ipairs(mask.Upgrades) do
-			if value.TierId and value.Price then
-				itemClassification:addTier(value.TierId, value.Price, value.Core)
+			if value.TierId then
+				logger.debug("Registering tier {}, core {}, regular price {}, fusion price {}, transfer price {}", value.TierId, value.Core, value.RegularPrice, value.ConvergenceFustionPrice, value.ConvergenceTransferPrice)
+				itemClassification:addTier(value.TierId, value.Core, value.RegularPrice, value.ConvergenceFustionPrice, value.ConvergenceTransferPrice)
 			else
 				logger.warn("[registerItemClassification.Upgrades] - Item classification failed on adquire TierID or Price attribute.")
 			end
 		end
 	end
-end
+end