Skip to content

Commit

Permalink
add options
Browse files Browse the repository at this point in the history
  • Loading branch information
@alaingilbert
alaingilbert committed Jan 31, 2021
1 parent 6b4300c commit 06c5af7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ type Prioritizable interface {
CancelResearch(CelestialID) error
ConstructionsBeingBuilt(CelestialID) (buildingID ID, buildingCountdown int64, researchID ID, researchCountdown int64)
EnsureFleet(celestialID CelestialID, ships []Quantifiable, speed Speed, where Coordinate, mission MissionID, resources Resources, holdingTime, unionID int64) (Fleet, error)
GetDefense(CelestialID) (DefensesInfos, error)
GetFacilities(CelestialID) (Facilities, error)
GetDefense(CelestialID, ...Option) (DefensesInfos, error)
GetFacilities(CelestialID, ...Option) (Facilities, error)
GetProduction(CelestialID) ([]Quantifiable, int64, error)
GetResources(CelestialID) (Resources, error)
GetResourcesBuildings(CelestialID) (ResourcesBuildings, error)
GetResourcesBuildings(CelestialID, ...Option) (ResourcesBuildings, error)
GetResourcesDetails(CelestialID) (ResourcesDetails, error)
GetTechs(celestialID CelestialID) (ResourcesBuildings, Facilities, ShipsInfos, Researches, error)
GetShips(CelestialID) (ShipsInfos, error)
GetShips(CelestialID, ...Option) (ShipsInfos, error)
SendFleet(celestialID CelestialID, ships []Quantifiable, speed Speed, where Coordinate, mission MissionID, resources Resources, holdingTime, unionID int64) (Fleet, error)
TearDown(celestialID CelestialID, id ID) error

Expand Down
32 changes: 16 additions & 16 deletions ogame.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3231,23 +3231,23 @@ func (b *OGame) getResearch() Researches {
return researches
}

func (b *OGame) getResourcesBuildings(celestialID CelestialID) (ResourcesBuildings, error) {
pageHTML, _ := b.getPage(SuppliesPage, celestialID)
func (b *OGame) getResourcesBuildings(celestialID CelestialID, options ...Option) (ResourcesBuildings, error) {
pageHTML, _ := b.getPage(SuppliesPage, celestialID, options...)
return b.extractor.ExtractResourcesBuildings(pageHTML)
}

func (b *OGame) getDefense(celestialID CelestialID) (DefensesInfos, error) {
pageHTML, _ := b.getPage(DefensesPage, celestialID)
func (b *OGame) getDefense(celestialID CelestialID, options ...Option) (DefensesInfos, error) {
pageHTML, _ := b.getPage(DefensesPage, celestialID, options...)
return b.extractor.ExtractDefense(pageHTML)
}

func (b *OGame) getShips(celestialID CelestialID) (ShipsInfos, error) {
pageHTML, _ := b.getPage(ShipyardPage, celestialID)
func (b *OGame) getShips(celestialID CelestialID, options ...Option) (ShipsInfos, error) {
pageHTML, _ := b.getPage(ShipyardPage, celestialID, options...)
return b.extractor.ExtractShips(pageHTML)
}

func (b *OGame) getFacilities(celestialID CelestialID) (Facilities, error) {
pageHTML, _ := b.getPage(FacilitiesPage, celestialID)
func (b *OGame) getFacilities(celestialID CelestialID, options ...Option) (Facilities, error) {
pageHTML, _ := b.getPage(FacilitiesPage, celestialID, options...)
return b.extractor.ExtractFacilities(pageHTML)
}

Expand Down Expand Up @@ -4869,24 +4869,24 @@ func (b *OGame) SetResourceSettings(planetID PlanetID, settings ResourceSettings
}

// GetResourcesBuildings gets the resources buildings levels
func (b *OGame) GetResourcesBuildings(celestialID CelestialID) (ResourcesBuildings, error) {
return b.WithPriority(Normal).GetResourcesBuildings(celestialID)
func (b *OGame) GetResourcesBuildings(celestialID CelestialID, options ...Option) (ResourcesBuildings, error) {
return b.WithPriority(Normal).GetResourcesBuildings(celestialID, options...)
}

// GetDefense gets all the defenses units information of a planet
// Fails if planetID is invalid
func (b *OGame) GetDefense(celestialID CelestialID) (DefensesInfos, error) {
return b.WithPriority(Normal).GetDefense(celestialID)
func (b *OGame) GetDefense(celestialID CelestialID, options ...Option) (DefensesInfos, error) {
return b.WithPriority(Normal).GetDefense(celestialID, options...)
}

// GetShips gets all ships units information of a planet
func (b *OGame) GetShips(celestialID CelestialID) (ShipsInfos, error) {
return b.WithPriority(Normal).GetShips(celestialID)
func (b *OGame) GetShips(celestialID CelestialID, options ...Option) (ShipsInfos, error) {
return b.WithPriority(Normal).GetShips(celestialID, options...)
}

// GetFacilities gets all facilities information of a planet
func (b *OGame) GetFacilities(celestialID CelestialID) (Facilities, error) {
return b.WithPriority(Normal).GetFacilities(celestialID)
func (b *OGame) GetFacilities(celestialID CelestialID, options ...Option) (Facilities, error) {
return b.WithPriority(Normal).GetFacilities(celestialID, options...)
}

// GetProduction get what is in the production queue.
Expand Down
16 changes: 8 additions & 8 deletions prioritize.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,32 +263,32 @@ func (b *Prioritize) SetResourceSettings(planetID PlanetID, settings ResourceSet
}

// GetResourcesBuildings gets the resources buildings levels
func (b *Prioritize) GetResourcesBuildings(celestialID CelestialID) (ResourcesBuildings, error) {
func (b *Prioritize) GetResourcesBuildings(celestialID CelestialID, options ...Option) (ResourcesBuildings, error) {
b.begin("GetResourcesBuildings")
defer b.done()
return b.bot.getResourcesBuildings(celestialID)
return b.bot.getResourcesBuildings(celestialID, options...)
}

// GetDefense gets all the defenses units information of a planet
// Fails if planetID is invalid
func (b *Prioritize) GetDefense(celestialID CelestialID) (DefensesInfos, error) {
func (b *Prioritize) GetDefense(celestialID CelestialID, options ...Option) (DefensesInfos, error) {
b.begin("GetDefense")
defer b.done()
return b.bot.getDefense(celestialID)
return b.bot.getDefense(celestialID, options...)
}

// GetShips gets all ships units information of a planet
func (b *Prioritize) GetShips(celestialID CelestialID) (ShipsInfos, error) {
func (b *Prioritize) GetShips(celestialID CelestialID, options ...Option) (ShipsInfos, error) {
b.begin("GetShips")
defer b.done()
return b.bot.getShips(celestialID)
return b.bot.getShips(celestialID, options...)
}

// GetFacilities gets all facilities information of a planet
func (b *Prioritize) GetFacilities(celestialID CelestialID) (Facilities, error) {
func (b *Prioritize) GetFacilities(celestialID CelestialID, options ...Option) (Facilities, error) {
b.begin("GetFacilities")
defer b.done()
return b.bot.getFacilities(celestialID)
return b.bot.getFacilities(celestialID, options...)
}

// GetProduction get what is in the production queue.
Expand Down

0 comments on commit 06c5af7

Please sign in to comment.