add ergonomics as float (#13)

* add ergonomics as float * keep old struct name
tarkov-database · Dec 11, 2019 · 2d0dee7 · 2d0dee7
1 parent 1e5596a
commit 2d0dee7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/model/item/kind_firearm.go b/model/item/kind_firearm.go
@@ -17,7 +17,8 @@ type Firearm struct {
 	Modes             []string `json:"modes" bson:"modes"`
 	Velocity          float64  `json:"velocity" bson:"velocity"`
 	EffectiveDistance int64    `json:"effectiveDist" bson:"effectiveDist"`
-	Ergonomics        int64    `json:"ergonomics" bson:"ergonomics"`
+	ErgonomicsFloat   float64  `json:"ergonomicsFP" bson:"ergonomicsFP"`
+	Ergonomics        int64    `json:"ergonomics" bson:"ergonomics"` // Deprecated
 	FoldRectractable  bool     `json:"foldRectractable" bson:"foldRectractable"`
 	RecoilVertical    int64    `json:"recoilVertical" bson:"recoilVertical"`
 	RecoilHorizontal  int64    `json:"recoilHorizontal" bson:"recoilHorizontal"`

diff --git a/model/item/kind_magazine.go b/model/item/kind_magazine.go
@@ -9,12 +9,13 @@ const (
 type Magazine struct {
 	Item `bson:",inline"`
 
-	Capacity      int64            `json:"capacity" bson:"capacity"`
-	Caliber       string           `json:"caliber" bson:"caliber"`
-	Ergonomics    int64            `json:"ergonomics" bson:"ergonomics"`
-	Modifier      MagazineModifier `json:"modifier" bson:"modifier"`
-	GridModifier  GridModifier     `json:"gridModifier" bson:"gridModifier"`
-	Compatibility List             `json:"compatibility" bson:"compatibility"`
+	Capacity        int64            `json:"capacity" bson:"capacity"`
+	Caliber         string           `json:"caliber" bson:"caliber"`
+	ErgonomicsFloat float64          `json:"ergonomicsFP" bson:"ergonomicsFP"`
+	Ergonomics      int64            `json:"ergonomics" bson:"ergonomics"` // Deprecated
+	Modifier        MagazineModifier `json:"modifier" bson:"modifier"`
+	GridModifier    GridModifier     `json:"gridModifier" bson:"gridModifier"`
+	Compatibility   List             `json:"compatibility" bson:"compatibility"`
 }
 
 // MagazineModifier describes the properties of Modifier in Magazine

diff --git a/model/item/kind_modification.go b/model/item/kind_modification.go
@@ -57,14 +57,15 @@ const (
 type Modification struct {
 	Item `bson:",inline"`
 
-	Ergonomics    int64        `json:"ergonomics" bson:"ergonomics"`
-	Accuracy      float64      `json:"accuracy" bson:"accuracy"`
-	Recoil        float64      `json:"recoil" bson:"recoil"`
-	RaidModdable  int64        `json:"raidModdable" bson:"raidModdable"`
-	GridModifier  GridModifier `json:"gridModifier" bson:"gridModifier"`
-	Slots         Slots        `json:"slots" bson:"slots"`
-	Compatibility List         `json:"compatibility" bson:"compatibility"`
-	Conflicts     List         `json:"conflicts" bson:"conflicts"`
+	ErgonomicsFloat float64      `json:"ergonomicsFP" bson:"ergonomicsFP"`
+	Ergonomics      int64        `json:"ergonomics" bson:"ergonomics"` // Deprecated
+	Accuracy        float64      `json:"accuracy" bson:"accuracy"`
+	Recoil          float64      `json:"recoil" bson:"recoil"`
+	RaidModdable    int64        `json:"raidModdable" bson:"raidModdable"`
+	GridModifier    GridModifier `json:"gridModifier" bson:"gridModifier"`
+	Slots           Slots        `json:"slots" bson:"slots"`
+	Compatibility   List         `json:"compatibility" bson:"compatibility"`
+	Conflicts       List         `json:"conflicts" bson:"conflicts"`
 }
 
 // Weapon modifications //

diff --git a/model/item/prop_penalties.go b/model/item/prop_penalties.go
@@ -2,8 +2,9 @@ package item
 
 // Penalties holds all existing penaltie types
 type Penalties struct {
-	Mouse      float64 `json:"mouse,omitempty" bson:"mouse,omitempty"`
-	Speed      float64 `json:"speed,omitempty" bson:"speed,omitempty"`
-	Ergonomics int64   `json:"ergonomics,omitempty" bson:"ergonomics,omitempty"`
-	Deafness   string  `json:"deafness,omitempty" bson:"deafness,omitempty"`
+	Mouse           float64 `json:"mouse,omitempty" bson:"mouse,omitempty"`
+	Speed           float64 `json:"speed,omitempty" bson:"speed,omitempty"`
+	ErgonomicsFloat float64 `json:"ergonomicsFP,omitempty" bson:"ergonomicsFP,omitempty"`
+	Ergonomics      int64   `json:"ergonomics,omitempty" bson:"ergonomics,omitempty"` // Deprecated
+	Deafness        string  `json:"deafness,omitempty" bson:"deafness,omitempty"`
 }