interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nix extra sOld debug params

This commit is contained in:
Luke Meyers 2020-02-07 14:57:32 -08:00
parent a632810d39
commit 316adfedf9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/commands.go
View File

@ -13,7 +13,7 @@ const (
right right
) )
func doCommand(cmd command, s State, sOld State, teamID int) State { func doCommand(cmd command, s State, teamID int) State {
da := 1 da := 1
da += rand.Intn(3) - 1 da += rand.Intn(3) - 1
@ -35,6 +35,6 @@ func doCommand(cmd command, s State, sOld State, teamID int) State {
b.Lane-- b.Lane--
} }
s = updateBot(s, sOld, teamID, *b) s = updateBot(s, teamID, *b)
return s return s
} }

18
game/game.go
View File

@ -2,11 +2,11 @@ package game
func UpdateState(s State, sOld State) State { func UpdateState(s State, sOld State) State {
for i := range s.Teams { for i := range s.Teams {
s = doCommand(chooseCommand(s, i), s, sOld, i) s = doCommand(chooseCommand(s, i), s, i)
if b := activeBot(s.Teams[i]); b != nil { if b := activeBot(s.Teams[i]); b != nil {
s = moveBot(s, i, *b) s = moveBot(s, i, *b)
} }
s = maybePassBaton(s, sOld, i) s = maybePassBaton(s, i)
} }
for _, t := range s.Teams { for _, t := range s.Teams {
@ -18,7 +18,7 @@ func UpdateState(s State, sOld State) State {
return s return s
} }
func maybePassBaton(s State, sOld State, teamID int) State { func maybePassBaton(s State, teamID int) State {
t := s.Teams[teamID] t := s.Teams[teamID]
h := activeBot(t) h := activeBot(t)
if h == nil { if h == nil {
@ -32,12 +32,12 @@ func maybePassBaton(s State, sOld State, teamID int) State {
if abs(b.Pos-h.Pos) <= passDistance { if abs(b.Pos-h.Pos) <= passDistance {
h.v = 0 h.v = 0
h.a = 0 h.a = 0
s = updateBot(s, s, teamID, *h) s = updateBot(s, teamID, *h)
newH := t.Bots[i] newH := t.Bots[i]
newH.a = baseAccel newH.a = baseAccel
t.Baton.HolderID = newH.ID t.Baton.HolderID = newH.ID
s = updateTeam(s, sOld, t) s = updateTeam(s, t)
return updateBot(s, sOld, teamID, newH) return updateBot(s, teamID, newH)
} }
} }
@ -53,7 +53,7 @@ func activeBot(t Team) *Bot {
return nil return nil
} }
func updateBot(s State, sOld State, teamID int, b Bot) State { func updateBot(s State, teamID int, b Bot) State {
t := s.Teams[teamID] t := s.Teams[teamID]
for i, bb := range t.Bots { for i, bb := range t.Bots {
if bb.ID == b.ID { if bb.ID == b.ID {
@ -65,11 +65,11 @@ func updateBot(s State, sOld State, teamID int, b Bot) State {
} }
} }
s = updateTeam(s, sOld, t) s = updateTeam(s, t)
return s return s
} }
func updateTeam(s State, sOld State, t Team) State { func updateTeam(s State, t Team) State {
teams := append([]Team{}, s.Teams[:t.id]...) teams := append([]Team{}, s.Teams[:t.id]...)
teams = append(teams, t) teams = append(teams, t)
teams = append(teams, s.Teams[t.id+1:]...) teams = append(teams, s.Teams[t.id+1:]...)

2
game/physics.go
View File

@ -26,7 +26,7 @@ func moveBot(s State, teamID int, b Bot) State {
} }
} }
s = updateBot(s, s, teamID, b) s = updateBot(s, teamID, b)
return s return s
} }