1 files changed, 17 insertions, 0 deletions

diff --git a/tools/importer/ACDv2Reader.go b/tools/importer/ACDv2Reader.go
index 2ddca4d..974da52 100644
--- a/tools/importer/ACDv2Reader.go
+++ b/tools/importer/ACDv2Reader.go
@@ -9,6 +9,8 @@ import (
         "fagott.pw/grilist/modules/grils"
 )
 
+const failMsg = "Offenbar war meine Annahme bzgl. der Traits nicht ganz korrekt"
+
 type ACDv2Reader struct{}
 
 type ACDv2NameValue struct {
@@ -58,6 +60,21 @@ func (r *ACDv2Reader) Read(path string) WrappedGril {
         for _, v := range jObj.Tags {
                 g.Gril.Tags = append(g.Gril.Tags, v.Name)
         }
+        g.Gril.Traits = make([]grils.Trait, 0)
+        if len(jObj.Traits.Official) != len(jObj.Traits.Indexed) {
+                panic(failMsg)
+        }
+        for i := 0; i < len(jObj.Traits.Official); i++ {
+                if jObj.Traits.Official[i].Name != jObj.Traits.Indexed[i].Name {
+                        panic(failMsg)
+                }
+                t := grils.Trait{
+                        Name:          jObj.Traits.Official[i].Name,
+                        Value:         jObj.Traits.Indexed[i].Value,
+                        OfficialValue: jObj.Traits.Official[i].Value,
+                }
+                g.Gril.Traits = append(g.Gril.Traits, t)
+        }
         return g
 }