complete generator test
This commit is contained in:
@@ -21,17 +21,17 @@ func Generate(cfg ...func(*MapSetting)) (Map, error) {
|
||||
|
||||
freePlanets := ms.NobodysPlanets()
|
||||
|
||||
createPlanets := func(ps PlanetSetting) error {
|
||||
return m.CreatePlanets(ps.Count(freePlanets), float64(ps.MinDistanceHW), RandIFn(ps.MinSize, ps.MaxSize), RandIFn(ps.MinResource, ps.MaxResource))
|
||||
createPlanets := func(pc PlanetClass, ps PlanetSetting) error {
|
||||
return m.CreatePlanets(pc, rand.Intn(ps.MaxCount(freePlanets))+1, float64(ps.MinDistanceHW), RandIFn(ps.MinSize, ps.MaxSize), RandIFn(ps.MinResource, ps.MaxResource))
|
||||
}
|
||||
|
||||
// 1. Place Giant planets
|
||||
if err := createPlanets(ms.GiantPlanets); err != nil {
|
||||
if err := createPlanets(PlanetClassGiant, ms.GiantPlanets); err != nil {
|
||||
return Map{}, fmt.Errorf("%s: create giant planets: %s", ms, err)
|
||||
}
|
||||
|
||||
// 2. Place Big planets
|
||||
if err := createPlanets(ms.BigPlanets); err != nil {
|
||||
if err := createPlanets(PlanetClassBig, ms.BigPlanets); err != nil {
|
||||
return Map{}, fmt.Errorf("%s: create big planets: %s", ms, err)
|
||||
}
|
||||
|
||||
@@ -41,14 +41,14 @@ func Generate(cfg ...func(*MapSetting)) (Map, error) {
|
||||
if err != nil {
|
||||
return Map{}, fmt.Errorf("%s: hw new_coordinate: %s", ms, err)
|
||||
}
|
||||
hwPlanet := NewPlanet(hwCoord, float64(ms.HWSize), float64(ms.HWResources))
|
||||
hwPlanet := NewPlanet(PlanetClassHW, hwCoord, ms.HWSize, ms.HWResources)
|
||||
m.HomePlanets[player] = PlanetarySystem{HW: hwPlanet, DW: make([]Planet, ms.DWCount)}
|
||||
for dw := 0; dw < int(ms.DWCount); dw++ {
|
||||
p := rand.Float64()*(float64(ms.DWMaxDistance)-float64(ms.DWMinDistance)) + float64(ms.DWMinDistance)
|
||||
phi := rand.Float64() * 360
|
||||
x := p * math.Cos(phi)
|
||||
y := p * math.Sin(phi)
|
||||
dwPlanet := NewPlanet(Coordinate{hwCoord.X + x, hwCoord.Y + y}, float64(ms.DWSize), float64(ms.DWResources))
|
||||
dwPlanet := NewPlanet(PlanetClassDW, Coordinate{hwCoord.X + x, hwCoord.Y + y}, ms.DWSize, ms.DWResources)
|
||||
m.HomePlanets[player].DW[dw] = dwPlanet
|
||||
}
|
||||
}
|
||||
@@ -66,17 +66,17 @@ func Generate(cfg ...func(*MapSetting)) (Map, error) {
|
||||
}
|
||||
|
||||
// 5. Place Normal planets
|
||||
if err := createPlanets(ms.NormalPlanets); err != nil {
|
||||
if err := createPlanets(PlanetClassNormal, ms.NormalPlanets); err != nil {
|
||||
return Map{}, fmt.Errorf("%s: create normal planets: %s", ms, err)
|
||||
}
|
||||
|
||||
// 6. Place Rich planets
|
||||
if err := createPlanets(ms.RichPlanets); err != nil {
|
||||
if err := createPlanets(PlanetClassRich, ms.RichPlanets); err != nil {
|
||||
return Map{}, fmt.Errorf("%s: create rich planets: %s", ms, err)
|
||||
}
|
||||
|
||||
// 7. Place Asteroids
|
||||
if err := createPlanets(ms.Asterioids); err != nil {
|
||||
if err := createPlanets(PlanetClassAsterioid, ms.Asterioids); err != nil {
|
||||
return Map{}, fmt.Errorf("%s: create asteroids: %s", ms, err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user