Skip to content

Commit 8cdc3b8

Browse files
authored
Merge pull request #135 from xXxhaxmeister42xXx/helper-functions
Export functions for equipment and game phase names
2 parents bd3b44b + d03db0a commit 8cdc3b8

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

common/equipment.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ const (
4747
EqP250 EquipmentElement = 3
4848
EqDeagle EquipmentElement = 4
4949
EqFiveSeven EquipmentElement = 5
50-
EqDualBarettas EquipmentElement = 6
50+
EqDualBerettas EquipmentElement = 6
51+
EqDualBarettas EquipmentElement = 6 // Deprecated, use EqDualBerettas instead (spelling error)
5152
EqTec9 EquipmentElement = 7
5253
EqCZ EquipmentElement = 8
5354
EqUSP EquipmentElement = 9
@@ -112,6 +113,11 @@ var eqNameToWeapon map[string]EquipmentElement
112113

113114
var eqElementToName map[EquipmentElement]string
114115

116+
// EquipmentElementNames returns all human readable equipment names as map[EquipmentElement]string
117+
func EquipmentElementNames() map[EquipmentElement]string {
118+
return eqElementToName
119+
}
120+
115121
func init() {
116122
initEqNameToWeapon()
117123
initEqElementToName()
@@ -129,7 +135,7 @@ func initEqNameToWeapon() {
129135
eqNameToWeapon["decoy"] = EqDecoy
130136
eqNameToWeapon["decoygrenade"] = EqDecoy
131137
eqNameToWeapon["decoyprojectile"] = EqDecoy
132-
eqNameToWeapon["elite"] = EqDualBarettas
138+
eqNameToWeapon["elite"] = EqDualBerettas
133139
eqNameToWeapon["famas"] = EqFamas
134140
eqNameToWeapon["fiveseven"] = EqFiveSeven
135141
eqNameToWeapon["flashbang"] = EqFlash

common/gamerules.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ var gamePhaseToString = map[GamePhase]string{
5555
GamePhaseGameOver: "GameOver",
5656
}
5757

58+
// GamePhaseNames returns all human readable game phase names as map[GamePhase]string
59+
func GamePhaseNames() map[GamePhase]string {
60+
return gamePhaseToString
61+
}
62+
5863
func (r GamePhase) String() string {
5964
return gamePhaseToString[r]
6065
}

0 commit comments

Comments
 (0)