Merge branch 'release/42.1.10'

alaingilbert · Jul 5, 2020 · 55aa437 · 55aa437
2 parents 5a0acab + 9866749
commit 55aa437
Show file tree

Hide file tree

Showing 18 changed files with 164 additions and 25 deletions.
diff --git a/battlecruiser.go b/battlecruiser.go
@@ -17,7 +17,7 @@ func newBattlecruiser() *battlecruiser {
 	b.RapidfireFrom = map[ID]int64{DestroyerID: 2, DeathstarID: 15}
 	b.RapidfireAgainst = map[ID]int64{
 		EspionageProbeID: 5, SolarSatelliteID: 5, SmallCargoID: 3, LargeCargoID: 3,
-		HeavyFighterID: 4, CruiserID: 4, BattleshipID: 7,
+		HeavyFighterID: 4, CruiserID: 4, BattleshipID: 7, CrawlerID: 5,
 	}
 	b.Price = Resources{Metal: 30000, Crystal: 40000, Deuterium: 15000}
 	b.Requirements = map[ID]int64{LaserTechnologyID: 12, HyperspaceTechnologyID: 5,

diff --git a/battleship.go b/battleship.go
@@ -14,8 +14,8 @@ func newBattleship() *battleship {
 	b.BaseCargoCapacity = 1500
 	b.BaseSpeed = 10000
 	b.FuelConsumption = 500
-	b.RapidfireFrom = map[ID]int64{BattlecruiserID: 7, DeathstarID: 30}
-	b.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5}
+	b.RapidfireFrom = map[ID]int64{BattlecruiserID: 7, DeathstarID: 30, ReaperID: 7}
+	b.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, CrawlerID: 5, PathfinderID: 5}
 	b.Price = Resources{Metal: 45000, Crystal: 15000}
 	b.Requirements = map[ID]int64{ShipyardID: 7, HyperspaceDriveID: 4}
 	return b

diff --git a/bomber.go b/bomber.go
@@ -14,9 +14,9 @@ func newBomber() *bomber {
 	b.BaseCargoCapacity = 500
 	b.BaseSpeed = 4000
 	b.FuelConsumption = 700
-	b.RapidfireFrom = map[ID]int64{DeathstarID: 25}
+	b.RapidfireFrom = map[ID]int64{DeathstarID: 25, ReaperID: 4}
 	b.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5,
-		RocketLauncherID: 20, LightLaserID: 20, HeavyLaserID: 10, IonCannonID: 10}
+		RocketLauncherID: 20, LightLaserID: 20, HeavyLaserID: 10, IonCannonID: 10, CrawlerID: 5}
 	b.Price = Resources{Metal: 50000, Crystal: 25000, Deuterium: 15000}
 	b.Requirements = map[ID]int64{ImpulseDriveID: 6, ShipyardID: 8, PlasmaTechnologyID: 5}
 	return b

diff --git a/cmd/ogamed/main.go b/cmd/ogamed/main.go
@@ -293,7 +293,7 @@ func start(c *cli.Context) error {
 	e.POST("/bot/planets/:planetID/send-fleet", ogame.SendFleetHandler)
 	e.POST("/bot/planets/:planetID/send-ipm", ogame.SendIPMHandler)
 	e.GET("/bot/moons/:moonID/phalanx/:galaxy/:system/:position", ogame.PhalanxHandler)
-	e.GET("/bot/moons/:moonID/jump-gate", ogame.JumpGateHandler)
+	e.POST("/bot/moons/:moonID/jump-gate", ogame.JumpGateHandler)
 	e.GET("/game/allianceInfo.php", ogame.GetAlliancePageContentHandler) // Example: //game/allianceInfo.php?allianceId=500127
 
 	// Get/Post Page Content

diff --git a/colonyShip.go b/colonyShip.go
@@ -15,7 +15,7 @@ func newColonyShip() *colonyShip {
 	s.BaseSpeed = 2500
 	s.FuelConsumption = 1000
 	s.RapidfireFrom = map[ID]int64{DeathstarID: 250}
-	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5}
+	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, CrawlerID: 5}
 	s.Price = Resources{Metal: 10000, Crystal: 20000, Deuterium: 10000}
 	s.Requirements = map[ID]int64{ShipyardID: 4, ImpulseDriveID: 3}
 	return s

diff --git a/crawler.go b/crawler.go
@@ -14,7 +14,9 @@ func newCrawler() *crawler {
 	c.BaseCargoCapacity = 0
 	c.BaseSpeed = 0
 	c.FuelConsumption = 0
-	c.RapidfireFrom = map[ID]int64{LightFighterID: 5, HeavyFighterID: 5, CruiserID: 5, BattleshipID: 5, BattlecruiserID: 5, BomberID: 5, DestroyerID: 5, DeathstarID: 1250, ReaperID: 5, PathfinderID: 5, SmallCargoID: 5, LargeCargoID: 5, ColonyShipID: 5, RecyclerID: 5}
+	c.RapidfireFrom = map[ID]int64{LightFighterID: 5, HeavyFighterID: 5, CruiserID: 5, BattleshipID: 5,
+		BattlecruiserID: 5, BomberID: 5, DestroyerID: 5, DeathstarID: 1250, ReaperID: 5, PathfinderID: 5,
+		SmallCargoID: 5, LargeCargoID: 5, ColonyShipID: 5, RecyclerID: 5}
 	c.RapidfireAgainst = map[ID]int64{}
 	c.Price = Resources{Metal: 2000, Crystal: 2000, Deuterium: 1000}
 	c.Requirements = map[ID]int64{ShipyardID: 5, CombustionDriveID: 4, ArmourTechnologyID: 4, LaserTechnologyID: 4}

diff --git a/cruiser.go b/cruiser.go
@@ -14,9 +14,9 @@ func newCruiser() *cruiser {
 	s.BaseCargoCapacity = 800
 	s.BaseSpeed = 15000
 	s.FuelConsumption = 300
-	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 4, DeathstarID: 33}
+	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 4, DeathstarID: 33, PathfinderID: 3}
 	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5,
-		LightFighterID: 6, RocketLauncherID: 10}
+		LightFighterID: 6, RocketLauncherID: 10, CrawlerID: 5}
 	s.Price = Resources{Metal: 20000, Crystal: 7000, Deuterium: 2000}
 	s.Requirements = map[ID]int64{ShipyardID: 5, ImpulseDriveID: 4, IonTechnologyID: 2}
 	return s

diff --git a/cruiser_test.go b/cruiser_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestCruiser_RapidfireAgainst(t *testing.T) {
 	c := newCruiser()
-	assert.Equal(t, map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, LightFighterID: 6, RocketLauncherID: 10}, c.GetRapidfireAgainst())
+	assert.Equal(t, map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, LightFighterID: 6, RocketLauncherID: 10, CrawlerID: 5}, c.GetRapidfireAgainst())
 }
 
 func TestCruiser_GetCargoCapacity(t *testing.T) {

diff --git a/deathstar.go b/deathstar.go
@@ -19,7 +19,7 @@ func newDeathstar() *deathstar {
 		HeavyFighterID: 100, CruiserID: 33, BattleshipID: 30, ColonyShipID: 250,
 		RecyclerID: 250, EspionageProbeID: 1250, SolarSatelliteID: 1250, BomberID: 25,
 		DestroyerID: 5, RocketLauncherID: 200, LightLaserID: 200, HeavyLaserID: 100,
-		GaussCannonID: 50, IonCannonID: 100, BattlecruiserID: 15}
+		GaussCannonID: 50, IonCannonID: 100, BattlecruiserID: 15, CrawlerID: 1250, PathfinderID: 30, ReaperID: 10}
 	s.Price = Resources{Metal: 5000000, Crystal: 4000000, Deuterium: 1000000}
 	s.Requirements = map[ID]int64{ShipyardID: 12, GravitonTechnologyID: 1, HyperspaceDriveID: 7,
 		HyperspaceTechnology.ID: 6}

diff --git a/destroyer.go b/destroyer.go
@@ -14,9 +14,9 @@ func newDestroyer() *destroyer {
 	s.BaseCargoCapacity = 2000
 	s.BaseSpeed = 5000
 	s.FuelConsumption = 1000
-	s.RapidfireFrom = map[ID]int64{DeathstarID: 5}
+	s.RapidfireFrom = map[ID]int64{DeathstarID: 5, ReaperID: 3}
 	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5,
-		LightLaserID: 10, BattlecruiserID: 2}
+		LightLaserID: 10, BattlecruiserID: 2, CrawlerID: 5}
 	s.Price = Resources{Metal: 60000, Crystal: 50000, Deuterium: 15000}
 	s.Requirements = map[ID]int64{ShipyardID: 9, HyperspaceDriveID: 6, HyperspaceTechnologyID: 5}
 	return s

diff --git a/espionageProbe.go b/espionageProbe.go
@@ -17,7 +17,7 @@ func newEspionageProbe() *espionageProbe {
 	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 5, DestroyerID: 5, BomberID: 5,
 		RecyclerID: 5, ColonyShipID: 5, BattleshipID: 5, CruiserID: 5,
 		HeavyFighterID: 5, LightFighterID: 5, LargeCargoID: 5, DeathstarID: 1250,
-		SmallCargoID: 5}
+		SmallCargoID: 5, PathfinderID: 5, ReaperID: 5}
 	s.Price = Resources{Crystal: 1000}
 	s.Requirements = map[ID]int64{ShipyardID: 3, CombustionDriveID: 3, EspionageTechnologyID: 2}
 	return s

diff --git a/heavyFighter.go b/heavyFighter.go
@@ -14,8 +14,8 @@ func newHeavyFighter() *heavyFighter {
 	s.BaseCargoCapacity = 100
 	s.BaseSpeed = 10000
 	s.FuelConsumption = 75
-	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 4, DeathstarID: 100}
-	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, SmallCargoID: 3}
+	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 4, DeathstarID: 100, PathfinderID: 2}
+	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, SmallCargoID: 3, CrawlerID: 5}
 	s.Price = Resources{Metal: 6000, Crystal: 4000}
 	s.Requirements = map[ID]int64{ShipyardID: 3, ImpulseDriveID: 2, ArmourTechnologyID: 2}
 	return s

diff --git a/largeCargo.go b/largeCargo.go
@@ -15,7 +15,7 @@ func newLargeCargo() *largeCargo {
 	s.BaseSpeed = 7500
 	s.FuelConsumption = 50
 	s.RapidfireFrom = map[ID]int64{BattlecruiserID: 3, DeathstarID: 250}
-	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5}
+	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, CrawlerID: 5}
 	s.Price = Resources{Metal: 6000, Crystal: 6000}
 	s.Requirements = map[ID]int64{ShipyardID: 4, CombustionDriveID: 6}
 	return s

diff --git a/lightFighter.go b/lightFighter.go
@@ -14,8 +14,8 @@ func newLightFighter() *lightFighter {
 	l.BaseCargoCapacity = 50
 	l.BaseSpeed = 12500
 	l.FuelConsumption = 20
-	l.RapidfireFrom = map[ID]int64{CruiserID: 6, DeathstarID: 200}
-	l.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5}
+	l.RapidfireFrom = map[ID]int64{CruiserID: 6, DeathstarID: 200, PathfinderID: 3}
+	l.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, CrawlerID: 5}
 	l.Price = Resources{Metal: 3000, Crystal: 1000}
 	l.Requirements = map[ID]int64{ShipyardID: 1, CombustionDriveID: 1}
 	return l

diff --git a/recycler.go b/recycler.go
@@ -15,7 +15,7 @@ func newRecycler() *recycler {
 	s.BaseSpeed = 2000
 	s.FuelConsumption = 300
 	s.RapidfireFrom = map[ID]int64{DeathstarID: 250}
-	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5}
+	s.RapidfireAgainst = map[ID]int64{EspionageProbeID: 5, SolarSatelliteID: 5, CrawlerID: 5}
 	s.Price = Resources{Metal: 10000, Crystal: 6000, Deuterium: 2000}
 	s.Requirements = map[ID]int64{ShipyardID: 4, CombustionDriveID: 6, ShieldingTechnologyID: 2}
 	return s