Merge branch 'release/34.1.0'

baseShip.go

@@ -25,6 +25,10 @@ func (b BaseShip) GetFuelConsumption(techs Researches) int64 {
 	fuelConsumption := b.FuelConsumption
 	if b.ID == SmallCargoID && techs.ImpulseDrive >= 5 {
 		fuelConsumption *= 2
+	} else if b.ID == RecyclerID && techs.HyperspaceDrive >= 15 {
+		fuelConsumption *= 3
+	} else if b.ID == RecyclerID && techs.ImpulseDrive >= 17 {
+		fuelConsumption *= 2
 	}
 	return fuelConsumption
 }

extracts_v6.go

@@ -1514,6 +1514,8 @@ func extractUserInfosV6(pageHTML []byte, lang string) (UserInfos, error) {
 	switch lang {
 	case "fr":
 		infosRgx = regexp.MustCompile(`([\d\\.]+) \(Place ([\d.]+) sur ([\d.]+)\)`)
+	case "si":
+		infosRgx = regexp.MustCompile(`([\d\\.]+) \(Mesto ([\d.]+) od ([\d.]+)\)`)
 	case "sk":
 		infosRgx = regexp.MustCompile(`([\d\\.]+) \(Umiestnenie v rebr\\u00ed\\u010dku: ([\d.]+) z ([\d.]+)\)`)
 	case "no":

ogame_test.go

@@ -666,6 +666,20 @@ func TestExtractPlanet_sk(t *testing.T) {
 	assert.Nil(t, planet.Moon)
 }
 
+func TestExtractPlanet_si(t *testing.T) {
+	pageHTMLBytes, _ := ioutil.ReadFile("samples/v7.2/si/overview.html")
+	planet, _ := NewExtractorV6().ExtractPlanet(pageHTMLBytes, PlanetID(33625245), &OGame{language: "si"})
+	assert.Equal(t, "Glavni Planet", planet.Name)
+	assert.Equal(t, int64(12800), planet.Diameter)
+	assert.Equal(t, int64(41), planet.Temperature.Min)
+	assert.Equal(t, int64(81), planet.Temperature.Max)
+	assert.Equal(t, int64(0), planet.Fields.Built)
+	assert.Equal(t, int64(188), planet.Fields.Total)
+	assert.Equal(t, PlanetID(33625245), planet.ID)
+	assert.Equal(t, Coordinate{1, 70, 6, PlanetType}, planet.Coordinate)
+	assert.Nil(t, planet.Moon)
+}
+
 func TestExtractPlanet_gr(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("samples/gr/overview.html")
 	planet, _ := NewExtractorV6().ExtractPlanet(pageHTMLBytes, PlanetID(33629206), &OGame{language: "gr"})
@@ -1530,6 +1544,14 @@ func TestExtractUserInfos_sk(t *testing.T) {
 	assert.Equal(t, int64(90), infos.Total)
 }
 
+func TestExtractUserInfos_si(t *testing.T) {
+	pageHTMLBytes, _ := ioutil.ReadFile("samples/v7.2/si/overview.html")
+	infos, _ := NewExtractorV6().ExtractUserInfos(pageHTMLBytes, "si")
+	assert.Equal(t, int64(0), infos.Points)
+	assert.Equal(t, int64(59), infos.Rank)
+	assert.Equal(t, int64(60), infos.Total)
+}
+
 func TestExtractUserInfos_gr(t *testing.T) {
 	pageHTMLBytes, _ := ioutil.ReadFile("samples/gr/overview.html")
 	infos, _ := NewExtractorV6().ExtractUserInfos(pageHTMLBytes, "gr")

utils.go

@@ -107,6 +107,24 @@ func name2id(name string) ID {
 		"reaper":         ReaperID,
 		"pathfinder":     PathfinderID,
 
+		// si
+		"laheklovec":          LightFighterID,
+		"tezkilovec":          HeavyFighterID,
+		"krizarka":            CruiserID,
+		"bojnaladja":          BattleshipID,
+		"bojnakrizarka":       BattlecruiserID,
+		"bombnik":             BomberID,
+		"unicevalec":          DestroyerID,
+		"zvezdasmrti":         DeathstarID,
+		"majhnatovornaladja":  SmallCargoID,
+		"velikatovornaladja":  LargeCargoID,
+		"kolonizacijskaladja": ColonyShipID,
+		"vohunskasonda":       EspionageProbeID,
+		"soncnisatelit":       SolarSatelliteID,
+		"plazilec":            CrawlerID,
+		"kombajn":             ReaperID,
+		"iskalecsledi":        PathfinderID,
+
 		// ro
 		"vanatorusor":      LightFighterID,
 		"vanatorgreu":      HeavyFighterID,

utils_test.go

@@ -362,6 +362,25 @@ func TestName2id(t *testing.T) {
 	assert.Equal(t, ReaperID, name2id("Kosa"))
 	assert.Equal(t, PathfinderID, name2id("Prieskumník"))
 
+	// si
+	assert.Equal(t, LightFighterID, name2id("Lahek lovec"))
+	assert.Equal(t, HeavyFighterID, name2id("Težki lovec"))
+	assert.Equal(t, CruiserID, name2id("Križarka"))
+	assert.Equal(t, BattleshipID, name2id("Bojna ladja"))
+	assert.Equal(t, BattlecruiserID, name2id("Bojna križarka"))
+	assert.Equal(t, BomberID, name2id("Bombnik"))
+	assert.Equal(t, DestroyerID, name2id("Uničevalec"))
+	assert.Equal(t, DeathstarID, name2id("Zvezda smrti"))
+	assert.Equal(t, SmallCargoID, name2id("Majhna tovorna ladja"))
+	assert.Equal(t, LargeCargoID, name2id("Velika tovorna ladja"))
+	assert.Equal(t, ColonyShipID, name2id("Kolonizacijska ladja"))
+	assert.Equal(t, RecyclerID, name2id("Recikler"))
+	assert.Equal(t, EspionageProbeID, name2id("Vohunska sonda"))
+	assert.Equal(t, SolarSatelliteID, name2id("Sončni satelit"))
+	assert.Equal(t, CrawlerID, name2id("Plazilec"))
+	assert.Equal(t, ReaperID, name2id("Kombajn"))
+	assert.Equal(t, PathfinderID, name2id("Iskalec sledi"))
+
 	// fr
 	assert.Equal(t, LightFighterID, name2id("Chasseur léger"))
 	assert.Equal(t, HeavyFighterID, name2id("Chasseur lourd"))