From e7ea9cacce26395d464147238c73333324e66341 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Thu, 11 Mar 2021 08:23:24 +0100 Subject: [PATCH 1/5] d2enum: composite_type: removed Int method --- d2common/d2enum/composite_type_string.go | 4 ---- d2common/d2fileformats/d2cof/cof.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/d2common/d2enum/composite_type_string.go b/d2common/d2enum/composite_type_string.go index 5400d78a..e9b1a46e 100644 --- a/d2common/d2enum/composite_type_string.go +++ b/d2common/d2enum/composite_type_string.go @@ -37,7 +37,3 @@ func (i CompositeType) String() string { } return _CompositeType_name[_CompositeType_index[i]:_CompositeType_index[i+1]] } - -func (i CompositeType) Int() int { - return int(i) -} diff --git a/d2common/d2fileformats/d2cof/cof.go b/d2common/d2fileformats/d2cof/cof.go index f80809ae..80be1422 100644 --- a/d2common/d2fileformats/d2cof/cof.go +++ b/d2common/d2fileformats/d2cof/cof.go @@ -193,7 +193,7 @@ func (c *COF) Marshal() []byte { sw.PushBytes(c.unknownBodyBytes...) for i := range c.CofLayers { - sw.PushBytes(byte(c.CofLayers[i].Type.Int())) + sw.PushBytes(byte(c.CofLayers[i].Type)) sw.PushBytes(c.CofLayers[i].Shadow) if c.CofLayers[i].Selectable { From 36f356d0c3f7b7dbee545342c1b0d7338dcd6fc5 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Thu, 11 Mar 2021 08:35:14 +0100 Subject: [PATCH 2/5] d2enum: draw effect string --- d2common/d2enum/composite_type_string.go | 30 ++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/d2common/d2enum/composite_type_string.go b/d2common/d2enum/composite_type_string.go index e9b1a46e..a95d0741 100644 --- a/d2common/d2enum/composite_type_string.go +++ b/d2common/d2enum/composite_type_string.go @@ -37,3 +37,33 @@ 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 + +} From 00bd2c52a0bf1d47eed39b6b0fadd927f4d900dc Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Thu, 11 Mar 2021 09:11:54 +0100 Subject: [PATCH 3/5] d2enum: weapon class: Name method --- d2common/d2enum/draw_effect.go | 21 +++++++++++++++++++++ d2common/d2enum/weapon_class.go | 27 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/d2common/d2enum/draw_effect.go b/d2common/d2enum/draw_effect.go index a47822f1..d0378014 100644 --- a/d2common/d2enum/draw_effect.go +++ b/d2common/d2enum/draw_effect.go @@ -45,3 +45,24 @@ const ( func (d DrawEffect) Transparent() bool { return d != DrawEffectNone } + +func (d DrawEffect) String() string { + strings := map[DrawEffect]string{ + DrawEffectPctTransparency25: "25% alpha", + DrawEffectPctTransparency50: "50% alpha", + DrawEffectPctTransparency75: "75% alpha", + DrawEffectModulate: "Modulate", + DrawEffectBurn: "Burn", + DrawEffectNormal: "Normal", + DrawEffectMod2XTrans: "Mod2XTrans", + DrawEffectMod2X: "Mod2X", + DrawEffectNone: "None", + } + + drawEffect, found := strings[d] + if !found { + return "Unknown" + } + + return drawEffect +} diff --git a/d2common/d2enum/weapon_class.go b/d2common/d2enum/weapon_class.go index 7cabde41..3d2af107 100644 --- a/d2common/d2enum/weapon_class.go +++ b/d2common/d2enum/weapon_class.go @@ -24,3 +24,30 @@ const ( WeaponClassOneHandToHand // ht1 WeaponClassTwoHandToHand // ht2 ) + +func (w WeaponClass) Name() string { + strings := map[WeaponClass]string{ + WeaponClassNone: "None", + WeaponClassHandToHand: "Hand To Hand", + WeaponClassBow: "Bow", + WeaponClassOneHandSwing: "One Hand Swing", + WeaponClassOneHandThrust: "One Hand Thrust", + WeaponClassStaff: "Staff", + WeaponClassTwoHandSwing: "Two Hand Swing", + WeaponClassTwoHandThrust: "Two Hand Thrust", + WeaponClassCrossbow: "Crossbow", + WeaponClassLeftJabRightSwing: "Left Jab Right Swing", + WeaponClassLeftJabRightThrust: "Left Jab Right Thrust", + WeaponClassLeftSwingRightSwing: "Left Swing Right Swing", + WeaponClassLeftSwingRightThrust: "Left Swing Right Thrust", + WeaponClassOneHandToHand: "One Hand To Hand", + WeaponClassTwoHandToHand: "Two Hand To Hand", + } + + weaponClass, found := strings[w] + if !found { + return "Unknown" + } + + return weaponClass +} From a662bbaeb462efccfe232b7fa500b6f713c663ce Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Thu, 11 Mar 2021 09:22:50 +0100 Subject: [PATCH 4/5] 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 From 352e78ffba8227a67a0a9dfa67a185d478433959 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Thu, 11 Mar 2021 09:29:08 +0100 Subject: [PATCH 5/5] d2enum: lintfix --- d2common/d2enum/weapon_class.go | 1 + 1 file changed, 1 insertion(+) diff --git a/d2common/d2enum/weapon_class.go b/d2common/d2enum/weapon_class.go index 6f9a7a3e..cf7324f9 100644 --- a/d2common/d2enum/weapon_class.go +++ b/d2common/d2enum/weapon_class.go @@ -25,6 +25,7 @@ const ( WeaponClassTwoHandToHand // ht2 ) +// Name returns a full name of weapon class func (w WeaponClass) Name() string { strings := map[WeaponClass]string{ WeaponClassNone: "None",