From a662bbaeb462efccfe232b7fa500b6f713c663ce Mon Sep 17 00:00:00 2001
From: "M. Sz" <mszeptuch@protonmail.com>
Date: Thu, 11 Mar 2021 09:22:50 +0100
Subject: [PATCH] d2enum: move compositeType.Name method int composite_type.go;
 lintfix

---
 d2common/d2enum/composite_type.go        | 33 ++++++++++++++++++++++++
 d2common/d2enum/composite_type_string.go | 30 ---------------------
 d2common/d2enum/draw_effect.go           |  2 +-
 d2common/d2enum/weapon_class.go          |  2 +-
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/d2common/d2enum/composite_type.go b/d2common/d2enum/composite_type.go
index 6196ff4f..a6a53207 100644
--- a/d2common/d2enum/composite_type.go
+++ b/d2common/d2enum/composite_type.go
@@ -1,5 +1,9 @@
 package d2enum
 
+const (
+	unknown = "Unknown"
+)
+
 //go:generate stringer -linecomment -type CompositeType -output composite_type_string.go
 
 // CompositeType represents a composite type
@@ -25,3 +29,32 @@ const (
 	CompositeTypeSpecial8                       // S8
 	CompositeTypeMax
 )
+
+// Name returns a full name of layer
+func (i CompositeType) Name() string {
+	strings := map[CompositeType]string{
+		CompositeTypeHead:      "Head",
+		CompositeTypeTorso:     "Torso",
+		CompositeTypeLegs:      "Legs",
+		CompositeTypeRightArm:  "Right Arm",
+		CompositeTypeLeftArm:   "Left Arm",
+		CompositeTypeRightHand: "Right Hand",
+		CompositeTypeLeftHand:  "Left Hand",
+		CompositeTypeShield:    "Shield",
+		CompositeTypeSpecial1:  "Special 1",
+		CompositeTypeSpecial2:  "Special 2",
+		CompositeTypeSpecial3:  "Special 3",
+		CompositeTypeSpecial4:  "Special 4",
+		CompositeTypeSpecial5:  "Special 5",
+		CompositeTypeSpecial6:  "Special 6",
+		CompositeTypeSpecial7:  "Special 7",
+		CompositeTypeSpecial8:  "Special 8",
+	}
+
+	layerName, found := strings[i]
+	if !found {
+		return unknown
+	}
+
+	return layerName
+}
diff --git a/d2common/d2enum/composite_type_string.go b/d2common/d2enum/composite_type_string.go
index a95d0741..e9b1a46e 100644
--- a/d2common/d2enum/composite_type_string.go
+++ b/d2common/d2enum/composite_type_string.go
@@ -37,33 +37,3 @@ func (i CompositeType) String() string {
 	}
 	return _CompositeType_name[_CompositeType_index[i]:_CompositeType_index[i+1]]
 }
-
-// Name returns a full name of layer
-func (i CompositeType) Name() string {
-	strings := map[CompositeType]string{
-		CompositeTypeHead:      "Head",
-		CompositeTypeTorso:     "Torso",
-		CompositeTypeLegs:      "Legs",
-		CompositeTypeRightArm:  "Right Arm",
-		CompositeTypeLeftArm:   "Left Arm",
-		CompositeTypeRightHand: "Right Hand",
-		CompositeTypeLeftHand:  "Left Hand",
-		CompositeTypeShield:    "Shield",
-		CompositeTypeSpecial1:  "Special 1",
-		CompositeTypeSpecial2:  "Special 2",
-		CompositeTypeSpecial3:  "Special 3",
-		CompositeTypeSpecial4:  "Special 4",
-		CompositeTypeSpecial5:  "Special 5",
-		CompositeTypeSpecial6:  "Special 6",
-		CompositeTypeSpecial7:  "Special 7",
-		CompositeTypeSpecial8:  "Special 8",
-	}
-
-	layerName, found := strings[i]
-	if !found {
-		return "Unknown"
-	}
-
-	return layerName
-
-}
diff --git a/d2common/d2enum/draw_effect.go b/d2common/d2enum/draw_effect.go
index d0378014..f2e902aa 100644
--- a/d2common/d2enum/draw_effect.go
+++ b/d2common/d2enum/draw_effect.go
@@ -61,7 +61,7 @@ func (d DrawEffect) String() string {
 
 	drawEffect, found := strings[d]
 	if !found {
-		return "Unknown"
+		return unknown
 	}
 
 	return drawEffect
diff --git a/d2common/d2enum/weapon_class.go b/d2common/d2enum/weapon_class.go
index 3d2af107..6f9a7a3e 100644
--- a/d2common/d2enum/weapon_class.go
+++ b/d2common/d2enum/weapon_class.go
@@ -46,7 +46,7 @@ func (w WeaponClass) Name() string {
 
 	weaponClass, found := strings[w]
 	if !found {
-		return "Unknown"
+		return unknown
 	}
 
 	return weaponClass