mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35 from mdiluz/fix-starting-wind

Browse source 
Add the starting wind as north and ensure it's only updated the next day
This commit is contained in:
Marc Di Luzio 2020-07-24 23:27:07 +01:00 • committed by GitHub
commit abf67f7f37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/rove/world.go
View file

@ -59,6 +59,7 @@ func NewWorld(chunkSize int) *World {
TicksPerDay: 24, TicksPerDay: 24,
CurrentTicks: 0, CurrentTicks: 0,
Accountant: accounts.NewSimpleAccountant(), Accountant: accounts.NewSimpleAccountant(),
Wind: roveapi.Bearing_North,
} }
} }
@ -617,11 +618,6 @@ func (w *World) Tick() {
} }
} }
// Change the wind every day
if (w.CurrentTicks % w.TicksPerDay) == 0 {
w.Wind = roveapi.Bearing((rand.Int() % 8) + 1) // Random cardinal bearing
}
// Move all the rovers based on current wind and sails // Move all the rovers based on current wind and sails
for n, r := range w.Rovers { for n, r := range w.Rovers {
// Skip if we're not catching the wind // Skip if we're not catching the wind
@ -675,6 +671,11 @@ func (w *World) Tick() {
// Increment the current tick count // Increment the current tick count
w.CurrentTicks++ w.CurrentTicks++
// Change the wind every day
if (w.CurrentTicks % w.TicksPerDay) == 0 {
w.Wind = roveapi.Bearing((rand.Int() % 8) + 1) // Random cardinal bearing
}
} }
// ExecuteCommand will execute a single command // ExecuteCommand will execute a single command