From 4c5e20a6e78f72a749c517c6fcc75c176155b7c5 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Wed, 30 Dec 2020 17:44:11 -0500
Subject: Begin adding of group listing

---
 src/main/java/tlIItools/AffixSet.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/tlIItools/AffixSet.java')

diff --git a/src/main/java/tlIItools/AffixSet.java b/src/main/java/tlIItools/AffixSet.java
index d6b950f6..91c0dcd9 100644
--- a/src/main/java/tlIItools/AffixSet.java
+++ b/src/main/java/tlIItools/AffixSet.java
@@ -18,7 +18,7 @@ public class AffixSet {
 	 *
 	 * An affix group is a set of affixes that generally have the same or
 	 * similar effects, but have different intensities or spawn levels. */
-	public Map<String, Set<Affix>> affixGroups;
+	public Map<AffixGroup, Set<Affix>> affixGroups;
 
 	/** All of the ungrouped affixes contained in this set. */
 	public Set<Affix> ungroupedAffixes;
@@ -34,12 +34,13 @@ public class AffixSet {
 	 * 
 	 * @param afx The affix to add. */
 	public void addAffixByContents(Affix afx) {
-		String afxGroup = afx.getAffixGroupName();
+		AffixGroup group = afx.toAffixGroup();
+        String afxGroup = group.toString();
 		
 		if (afxGroup.equals("")) {
 			ungroupedAffixes.add(afx);
 		} else {
-			affixGroups.compute(afxGroup, (key, val) -> {
+			affixGroups.compute(group, (key, val) -> {
 				if (val == null) {
 					Set<Affix> afxSet = new HashSet<>();
 					afxSet.add(afx);
-- 
cgit v1.2.3