YAML files for rarely changed data. New weapon stats.

lib/datacache/elements.go

@@ -5,7 +5,9 @@ package datacache
 
 import (
 	"errors"
+	"gopkg.in/yaml.v2"
 	"source.wtfteam.pro/i2_bot/i2_bot/lib/datamapping"
+	"source.wtfteam.pro/i2_bot/i2_bot/static"
 	"strconv"
 )
 
@@ -27,18 +29,17 @@ func (dc *DataCache) loadElements() {
 func (dc *DataCache) getElements() []datamapping.Element {
 	elements := []datamapping.Element{}
 
-	elements = append(elements, datamapping.Element{1, "👊", "Боевой", 1})
-	elements = append(elements, datamapping.Element{2, "🌀", "Летающий", 1})
-	elements = append(elements, datamapping.Element{3, "💀", "Ядовитый", 1})
-	elements = append(elements, datamapping.Element{4, "🗿", "Каменный", 1})
-	elements = append(elements, datamapping.Element{5, "🔥", "Огненный", 2})
-	elements = append(elements, datamapping.Element{6, "⚡", "Электрический", 2})
-	elements = append(elements, datamapping.Element{7, "💧", "Водяной", 2})
-	elements = append(elements, datamapping.Element{8, "🍀", "Травяной", 2})
-	elements = append(elements, datamapping.Element{9, "💩", "Отважный", 3})
-	elements = append(elements, datamapping.Element{10, "👁", "Психический", 3})
-	elements = append(elements, datamapping.Element{11, "👿", "Тёмный", 3})
-	elements = append(elements, datamapping.Element{12, "⌛", "Времени", 3})
+	yamlFile, err := static.ReadFile("elements.yml")
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't read elements data file")
+	}
+
+	err = yaml.Unmarshal(yamlFile, &elements)
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't parse elements data file")
+	}
 
 	return elements
 }

lib/datacache/leagues.go

@@ -5,7 +5,9 @@ package datacache
 
 import (
 	"errors"
+	"gopkg.in/yaml.v2"
 	"source.wtfteam.pro/i2_bot/i2_bot/lib/datamapping"
+	"source.wtfteam.pro/i2_bot/i2_bot/static"
 	"strconv"
 )
 
@@ -27,9 +29,17 @@ func (dc *DataCache) loadLeagues() {
 func (dc *DataCache) getLeagues() []datamapping.League {
 	leagues := []datamapping.League{}
 
-	leagues = append(leagues, datamapping.League{1, "🈸", "ИНСТИНКТ"})
-	leagues = append(leagues, datamapping.League{2, "🈳 ", "МИСТИКА"})
-	leagues = append(leagues, datamapping.League{3, "🈵", "ОТВАГА"})
+	yamlFile, err := static.ReadFile("leagues.yml")
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't read leagues data file")
+	}
+
+	err = yaml.Unmarshal(yamlFile, &leagues)
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't parse leagues data file")
+	}
 
 	return leagues
 }

lib/datacache/locations.go

@@ -5,7 +5,9 @@ package datacache
 
 import (
 	"errors"
+	"gopkg.in/yaml.v2"
 	"source.wtfteam.pro/i2_bot/i2_bot/lib/datamapping"
+	"source.wtfteam.pro/i2_bot/i2_bot/static"
 	"strconv"
 )
 
@@ -27,12 +29,17 @@ func (dc *DataCache) loadLocations() {
 func (dc *DataCache) getLocations() []datamapping.Location {
 	locations := []datamapping.Location{}
 
-	locations = append(locations, datamapping.Location{1, "🌲", "Лес"})
-	locations = append(locations, datamapping.Location{2, "⛰", "Горы"})
-	locations = append(locations, datamapping.Location{3, "🚣", "Озеро"})
-	locations = append(locations, datamapping.Location{4, "🏙", "Город"})
-	locations = append(locations, datamapping.Location{5, "🏛", "Катакомбы"})
-	locations = append(locations, datamapping.Location{6, "⛪️", "Кладбище"})
+	yamlFile, err := static.ReadFile("locations.yml")
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't read locations data file")
+	}
+
+	err = yaml.Unmarshal(yamlFile, &locations)
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't parse locations data file")
+	}
 
 	return locations
 }

lib/datacache/weapons.go

@@ -5,7 +5,9 @@ package datacache
 
 import (
 	"errors"
+	"gopkg.in/yaml.v2"
 	"source.wtfteam.pro/i2_bot/i2_bot/lib/datamapping"
+	"source.wtfteam.pro/i2_bot/i2_bot/static"
 	"strconv"
 	"strings"
 )
@@ -28,13 +30,17 @@ func (dc *DataCache) loadWeapons() {
 func (dc *DataCache) getWeapons() []datamapping.Weapon {
 	weapons := []datamapping.Weapon{}
 
-	weapons = append(weapons, datamapping.Weapon{1, "Бита", 2, 5})
-	weapons = append(weapons, datamapping.Weapon{2, "Стальная бита", 10, 40})
-	weapons = append(weapons, datamapping.Weapon{3, "Чугунная бита", 200, 500})
-	weapons = append(weapons, datamapping.Weapon{4, "Титановая бита", 2000, 10000})
-	weapons = append(weapons, datamapping.Weapon{5, "Алмазная бита", 10000, 100000})
-	weapons = append(weapons, datamapping.Weapon{6, "Криптонитовая бита", 100000, 500000})
-	weapons = append(weapons, datamapping.Weapon{7, "Буханка из пятёры", 1000000, 5000000})
+	yamlFile, err := static.ReadFile("weapons.yml")
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't read weapons data file")
+	}
+
+	err = yaml.Unmarshal(yamlFile, &weapons)
+	if err != nil {
+		c.Log.Error(err.Error())
+		c.Log.Fatal("Can't parse weapons data file")
+	}
 
 	return weapons
 }

lib/datamapping/elements.go

@@ -5,8 +5,8 @@ package datamapping
 
 // Element is a struct, which represents element data
 type Element struct {
-	ID       int
-	Symbol   string
-	Name     string
-	LeagueID int
+	ID       int    `yaml:"id"`
+	Symbol   string `yaml:"symbol"`
+	Name     string `yaml:"name"`
+	LeagueID int    `yaml:"league_id"`
 }

lib/datamapping/leagues.go

@@ -5,7 +5,7 @@ package datamapping
 
 // League is a struct, which represents league data
 type League struct {
-	ID     int
-	Symbol string
-	Name   string
+	ID     int    `yaml:"id"`
+	Symbol string `yaml:"symbol"`
+	Name   string `yaml:"name"`
 }

lib/datamapping/locations.go

@@ -5,7 +5,7 @@ package datamapping
 
 // Location is a struct, which represents location data
 type Location struct {
-	ID     int
-	Symbol string
-	Name   string
+	ID     int    `yaml:"id"`
+	Symbol string `yaml:"symbol"`
+	Name   string `yaml:"name"`
 }

lib/datamapping/weapons.go

@@ -5,8 +5,8 @@ package datamapping
 
 // Weapon is a struct, which represents weapon data
 type Weapon struct {
-	ID    int
-	Name  string
-	Power int
-	Price int
+	ID    int    `yaml:"id"`
+	Name  string `yaml:"name"`
+	Power int    `yaml:"power"`
+	Price int    `yaml:"price"`
 }