Merge branch 'release/42.7.0'

baseShip.go

@@ -9,11 +9,15 @@ type BaseShip struct {
 }
 
 // GetCargoCapacity returns ship cargo capacity
-func (b BaseShip) GetCargoCapacity(techs Researches, probeRaids, isCollector bool) int64 {
+func (b BaseShip) GetCargoCapacity(techs Researches, probeRaids, isCollector, isPioneers bool) int64 {
 	if b.GetID() == EspionageProbeID && !probeRaids {
 		return 0
 	}
-	cargo := b.BaseCargoCapacity + int64(float64(b.BaseCargoCapacity*techs.HyperspaceTechnology)*0.05)
+	hyperspaceBonus := 0.05
+	if isPioneers {
+		hyperspaceBonus = 0.02
+	}
+	cargo := b.BaseCargoCapacity + int64(float64(b.BaseCargoCapacity*techs.HyperspaceTechnology)*hyperspaceBonus)
 	if isCollector && (b.ID == SmallCargoID || b.ID == LargeCargoID) {
 		cargo += int64(float64(b.BaseCargoCapacity) * 0.25)
 	}

colonyShip_test.go

@@ -15,6 +15,6 @@ func TestColonyShip_GetSpeed(t *testing.T) {
 
 func TestColony_GetCargoCapacity(t *testing.T) {
 	cs := newColonyShip()
-	assert.Equal(t, int64(10500), cs.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false))
+	assert.Equal(t, int64(10500), cs.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false, false))
 
 }

cruiser_test.go

@@ -13,8 +13,8 @@ func TestCruiser_RapidfireAgainst(t *testing.T) {
 
 func TestCruiser_GetCargoCapacity(t *testing.T) {
 	c := newCruiser()
-	assert.Equal(t, int64(800), c.GetCargoCapacity(Researches{HyperspaceTechnology: 0}, false, false))
-	assert.Equal(t, int64(1120), c.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false))
+	assert.Equal(t, int64(800), c.GetCargoCapacity(Researches{HyperspaceTechnology: 0}, false, false, false))
+	assert.Equal(t, int64(1120), c.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false, false))
 }
 
 func TestCruiser_GetFuelConsumption(t *testing.T) {

extractor_v6.go

@@ -19,6 +19,11 @@ func NewExtractorV6() *ExtractorV6 {
 	return &ExtractorV6{}
 }
 
+// ExtractDestroyRockets ...
+func (e ExtractorV6) ExtractDestroyRockets(pageHTML []byte) (abm, ipm int64, token string, err error) {
+	panic("implement me")
+}
+
 // ExtractCancelFleetToken ...
 func (e ExtractorV6) ExtractCancelFleetToken(pageHTML []byte, fleetID FleetID) (string, error) {
 	panic("implement me")

extractor_v71.go

@@ -57,6 +57,17 @@ func (e ExtractorV71) ExtractEspionageReportFromDoc(doc *goquery.Document, locat
 	return extractEspionageReportFromDocV71(doc, location)
 }
 
+// ExtractDestroyRockets ...
+func (e ExtractorV71) ExtractDestroyRockets(pageHTML []byte) (abm, ipm int64, token string, err error) {
+	doc, _ := goquery.NewDocumentFromReader(bytes.NewReader(pageHTML))
+	return e.ExtractDestroyRocketsFromDoc(doc)
+}
+
+// ExtractDestroyRocketsFromDoc ...
+func (e ExtractorV71) ExtractDestroyRocketsFromDoc(doc *goquery.Document) (abm, ipm int64, token string, err error) {
+	return extractDestroyRocketsFromDocV71(doc)
+}
+
 // ExtractIPM ...
 func (e ExtractorV71) ExtractIPM(pageHTML []byte) (duration int64, max int64, token string) {
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewReader(pageHTML))

extracts_v6.go

@@ -1258,7 +1258,7 @@ func extractServerTimeFromDocV6(doc *goquery.Document) (time.Time, error) {
 
 	u1 := time.Now().UTC().Unix()
 	u2 := serverTime.Unix()
-	n := int(math.Round(float64(u2-u1)/15)) * 15
+	n := int(math.Round(float64(u2-u1)/900)) * 900 // u2-u1 should be close to 0, round to nearest 15min difference
 
 	serverTime = serverTime.Add(time.Duration(-n) * time.Second).In(time.FixedZone("OGT", n))
 

extracts_v71.go

@@ -513,6 +513,20 @@ func extractEspionageReportFromDocV71(doc *goquery.Document, location *time.Loca
 	return report, nil
 }
 
+func extractDestroyRocketsFromDocV71(doc *goquery.Document) (abm, ipm int64, token string, err error) {
+	scriptTxt := doc.Find("script").Text()
+	r := regexp.MustCompile(`missileToken = "([^"]+)"`)
+	m := r.FindStringSubmatch(scriptTxt)
+	if len(m) != 2 {
+		err = errors.New("failed to find missile token")
+		return
+	}
+	token = m[1]
+	abm, _ = strconv.ParseInt(doc.Find("table tr").Eq(1).Find("td").Eq(1).Text(), 10, 64)
+	ipm, _ = strconv.ParseInt(doc.Find("table tr").Eq(2).Find("td").Eq(1).Text(), 10, 64)
+	return
+}
+
 func extractIPMFromDocV71(doc *goquery.Document) (duration, max int64, token string) {
 	durationFloat, _ := strconv.ParseFloat(doc.Find("span#timer").AttrOr("data-duration", "0"), 64)
 	duration = int64(math.Ceil(durationFloat))

fleetBuilder.go

@@ -215,7 +215,7 @@ func (f *FleetBuilder) sendNow(tx Prioritizable) error {
 	if f.resources.Metal == -1 || f.resources.Crystal == -1 || f.resources.Deuterium == -1 {
 		// Calculate cargo
 		techs := tx.GetResearch()
-		cargoCapacity := f.ships.Cargo(techs, f.b.GetServer().Settings.EspionageProbeRaids == 1, f.b.CharacterClass() == Collector)
+		cargoCapacity := f.ships.Cargo(techs, f.b.GetServer().Settings.EspionageProbeRaids == 1, f.b.CharacterClass() == Collector, f.b.IsPioneers())
 		if f.minimumDeuterium <= 0 {
 			planetResources, _ = tx.GetResources(f.origin.GetID())
 		}

id.go

@@ -251,6 +251,14 @@ func (o ID) IsShip() bool {
 		o == PathfinderID
 }
 
+// IsFlyableShip returns either or not the id is a ship that can fly
+func (o ID) IsFlyableShip() bool {
+	if o == SolarSatelliteID || o == CrawlerID {
+		return false
+	}
+	return o.IsShip()
+}
+
 // IsCombatShip ...
 func (o ID) IsCombatShip() bool {
 	return o == LightFighterID ||

interfaces.go

@@ -1,6 +1,7 @@
 package ogame
 
 import (
+	"crypto/tls"
 	"net/http"
 	"net/url"
 	"time"
@@ -57,6 +58,7 @@ type Prioritizable interface {
 	Highscore(category, typ, page int64) (Highscore, error)
 	IsUnderAttack() (bool, error)
 	Login() error
+	LoginWithBearerToken(token string) (bool, error)
 	LoginWithExistingCookies() (bool, error)
 	Logout()
 	OfferBuyMarketplace(itemID interface{}, quantity, priceType, price, priceRange int64, celestialID CelestialID) error
@@ -95,6 +97,7 @@ type Prioritizable interface {
 	GetResourceSettings(PlanetID) (ResourceSettings, error)
 	GetResourcesProductions(PlanetID) (Resources, error)
 	GetResourcesProductionsLight(ResourcesBuildings, Researches, ResourceSettings, Temperature) Resources
+	DestroyRockets(PlanetID, int64, int64) error
 	SendIPM(PlanetID, Coordinate, int64, ID) (int64, error)
 	SetResourceSettings(PlanetID, ResourceSettings) error
 
@@ -111,6 +114,7 @@ type Wrapper interface {
 	AddAccount(number int, lang string) (NewAccount, error)
 	BytesDownloaded() int64
 	BytesUploaded() int64
+	IsPioneers() bool
 	CharacterClass() CharacterClass
 	Disable()
 	Distance(origin, destination Coordinate) int64
@@ -123,6 +127,7 @@ type Wrapper interface {
 	GetCachedPlayer() UserInfos
 	GetCachedPreferences() Preferences
 	GetClient() *OGameClient
+	SetClient(*OGameClient)
 	GetExtractor() Extractor
 	GetLanguage() string
 	GetNbSystems() int64
@@ -149,7 +154,7 @@ type Wrapper interface {
 	OnStateChange(clb func(locked bool, actor string))
 	Quiet(bool)
 	ReconnectChat() bool
-	RegisterAuctioneerCallback(func([]byte))
+	RegisterAuctioneerCallback(func(interface{}))
 	RegisterChatCallback(func(ChatMsg))
 	RegisterHTMLInterceptor(func(method, url string, params, payload url.Values, pageHTML []byte))
 	RegisterWSCallback(string, func([]byte))
@@ -158,7 +163,7 @@ type Wrapper interface {
 	ServerVersion() string
 	SetLoginWrapper(func(func() (bool, error)) error)
 	SetOGameCredentials(username, password, otpSecret string)
-	SetProxy(proxyAddress, username, password, proxyType string, loginOnly bool) error
+	SetProxy(proxyAddress, username, password, proxyType string, loginOnly bool, config *tls.Config) error
 	SetUserAgent(newUserAgent string)
 	WithPriority(priority int) Prioritizable
 }
@@ -203,7 +208,7 @@ type DefenderObj interface {
 // Ship interface implemented by all ships units
 type Ship interface {
 	DefenderObj
-	GetCargoCapacity(techs Researches, probeRaids, isCollector bool) int64
+	GetCargoCapacity(techs Researches, probeRaids, isCollector, isPioneers bool) int64
 	GetSpeed(techs Researches, isCollector, isGeneral bool) int64
 	GetFuelConsumption(techs Researches, fleetDeutSaveFactor float64, isGeneral bool) int64
 }
@@ -255,6 +260,7 @@ type Extractor interface {
 	ExtractCelestial(pageHTML []byte, b *OGame, v interface{}) (Celestial, error)
 	ExtractServerTime(pageHTML []byte) (time.Time, error)
 	ExtractFleetsFromEventList(pageHTML []byte) []Fleet
+	ExtractDestroyRockets(pageHTML []byte) (abm, ipm int64, token string, err error)
 	ExtractIPM(pageHTML []byte) (duration, max int64, token string)
 	ExtractFleets(pageHTML []byte) (res []Fleet)
 	ExtractSlots(pageHTML []byte) Slots

largeCargo_test.go

@@ -14,7 +14,7 @@ func TestLargeCargo_GetSpeed(t *testing.T) {
 
 func TestLargeCargo_GetCargoCapacity(t *testing.T) {
 	lc := newLargeCargo()
-	assert.Equal(t, int64(35000), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false))
-	assert.Equal(t, int64(37500), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 10}, false, false))
-	assert.Equal(t, int64(43750), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 10}, false, true))
+	assert.Equal(t, int64(35000), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 8}, false, false, false))
+	assert.Equal(t, int64(37500), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 10}, false, false, false))
+	assert.Equal(t, int64(43750), lc.GetCargoCapacity(Researches{HyperspaceTechnology: 10}, false, true, false))
 }