Skip to content

Commit

Permalink
Merge branch 'release/1.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
alaingilbert committed Sep 24, 2018
2 parents 65a80f8 + 38fbf32 commit 7508348
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion ogame.go
Original file line number Diff line number Diff line change
Expand Up @@ -2243,6 +2243,8 @@ func (b *OGame) sendFleet(planetID PlanetID, ships []Quantifiable, speed Speed,
})
return fields
}

// Page 1 : get to fleet page
pageHTML := b.getPageContent(url.Values{"page": {"fleet1"}, "cp": {planetID.String()}})

fleet1Doc, _ := goquery.NewDocumentFromReader(strings.NewReader(pageHTML))
Expand Down Expand Up @@ -2274,6 +2276,8 @@ func (b *OGame) sendFleet(planetID PlanetID, ships []Quantifiable, speed Speed,
payload.Add("am"+strconv.Itoa(int(s.ID)), strconv.Itoa(s.Nbr))
}
}

// Page 2 : select ships
fleet2URL := b.serverURL + "/game/index.php?page=fleet2"
fleet2Resp, err := b.client.PostForm(fleet2URL, payload)
if err != nil {
Expand Down Expand Up @@ -2340,6 +2344,7 @@ func (b *OGame) sendFleet(planetID PlanetID, ships []Quantifiable, speed Speed,
return 0, ErrPlanetAlreadyReservecForRelocation
}

// Page 3 : select coord, mission, speed
fleet3URL := b.serverURL + "/game/index.php?page=fleet3"
fleet3Resp, err := b.client.PostForm(fleet3URL, payload)
if err != nil {
Expand All @@ -2363,11 +2368,14 @@ func (b *OGame) sendFleet(planetID PlanetID, ships []Quantifiable, speed Speed,
payload.Add("crystal", strconv.Itoa(resources.Crystal))
payload.Add("deuterium", strconv.Itoa(resources.Deuterium))
payload.Add("metal", strconv.Itoa(resources.Metal))
payload.Add("mission", mission.String())
payload.Add("mission", strconv.Itoa(int(mission)))

// Page 4 : send the fleet
movementURL := b.serverURL + "/game/index.php?page=movement"
movementResp, _ := b.client.PostForm(movementURL, payload)
defer movementResp.Body.Close()

// Page 5
movementHTML := b.getPageContent(url.Values{"page": {"movement"}})
doc, _ := goquery.NewDocumentFromReader(strings.NewReader(movementHTML))
matches := make([]int, 0)
Expand Down

0 comments on commit 7508348

Please sign in to comment.