From a57ce99e5ed0657dc966155b7529b0db6a4d0559 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Mon, 13 Jul 2020 15:56:23 -0700 Subject: [PATCH] Added gemsockets column to ItemEntry and improved MaxSock support in ItemTypes --- core/src/com/riiablo/codec/excel/ItemEntry.java | 1 + core/src/com/riiablo/codec/excel/ItemTypes.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/riiablo/codec/excel/ItemEntry.java b/core/src/com/riiablo/codec/excel/ItemEntry.java index 680131e7..3aa46bcb 100644 --- a/core/src/com/riiablo/codec/excel/ItemEntry.java +++ b/core/src/com/riiablo/codec/excel/ItemEntry.java @@ -42,6 +42,7 @@ public class ItemEntry extends Excel.Entry { @Column public int mindam; @Column public int maxdam; @Column public int speed; + @Column public int gemsockets; @Column public int gemapplytype; @Column public boolean PermStoreItem; @Column public boolean multibuy; diff --git a/core/src/com/riiablo/codec/excel/ItemTypes.java b/core/src/com/riiablo/codec/excel/ItemTypes.java index 75780dbb..5a734e4a 100644 --- a/core/src/com/riiablo/codec/excel/ItemTypes.java +++ b/core/src/com/riiablo/codec/excel/ItemTypes.java @@ -53,9 +53,8 @@ public class ItemTypes extends Excel { @Column public boolean Charm; @Column public boolean Gem; @Column public boolean Beltable; - @Column public int MaxSock1; - @Column public int MaxSock25; - @Column public int MaxSock40; + @Column(format = "MaxSock%s", values = {"1", "25", "40"}, endIndex = 3) + public int MaxSock[]; @Column public int TreasureClass; @Column public int Rarity; @Column public String StaffMods;