switch to pop queue

diff --git a/game/chance.go b/game/chance.go
index b6b05734f55d3cb566c61b0dc8579fa0fd1676ad..13034755315cf205339a73a188fc895a85c9f581 100644 (file)
--- a/game/chance.go
+++ b/game/chance.go
@@ -10,7 +10,12 @@ func (ctx *Context) getOwnerID(sID SpaceID) PlayerID {
 }
 
 func (ctx *Context) ProcessChance() {
-       for _, visitorID := range ctx.Visitors.Chance {
+       for {
+               visitorID, done := QueuePop(&ctx.Visitors.Chance)
+               if done {
+                       break
+               }
+
                card := ctx.Random.IntN(len(ChanceCards))
 
                currentPos := ctx.Players.Alive[visitorID.Index()].CurrentSpaceID

diff --git a/game/chest.go b/game/chest.go
index 3c141ee8fab69dd78b0052855b6e0795ea3dec95..9a31622d93695f41b12ab15f3b1ee0c0aa197f8b 100644 (file)
--- a/game/chest.go
+++ b/game/chest.go
@@ -1,7 +1,11 @@
 package game
 
 func (ctx *Context) ProcessChest() {
-       for _, visitorID := range ctx.Visitors.Chest {
+       for {
+               visitorID, done := QueuePop(&ctx.Visitors.Chest)
+               if done {
+                       break
+               }
                card := ctx.Random.IntN(len(ChanceCards))
 
                currentPos := ctx.Players.Alive[visitorID.Index()].CurrentSpaceID

diff --git a/game/color.go b/game/color.go
index a2eaa5cd8add552a10f0da7bf13f62ced5bcc883..e1826c9a26a7ce0a6f51cd64d1f39b8c1533aedb 100644 (file)
--- a/game/color.go
+++ b/game/color.go
@@ -30,7 +30,12 @@ func (ctx *Context) HasColorMonopoly(playerID PlayerID, targetGroup ColorGroup)
 }
 
 func (ctx *Context) ProcessOwnedColors() {
-       for _, oCV := range ctx.Visitors.Color {
+       for {
+               oCV, done := QueuePop(&ctx.Visitors.Color)
+               if done {
+                       break
+               }
+
                visitorID := oCV.VisitorID
                ownerID := oCV.OwnerID
                colorID := oCV.ColorID

diff --git a/game/movement.go b/game/movement.go
index 1b47ca455f9373a0f09fe7b812da3e79558a9e6a..98190097f894cd5f795097cba193ae91ee633152 100644 (file)
--- a/game/movement.go
+++ b/game/movement.go
@@ -10,11 +10,16 @@ func GetPlayerMoveDistance(start SpaceID, dest SpaceID) int32 {
 
 func (ctx *Context) ProcessMovement() {
        cID := ctx.Turn.Current
-       dist := ctx.Turn.MoveQueue[0]
-       ctx.Turn.MoveQueue = ctx.Turn.MoveQueue[1:]
-       ctx.AdvancePlayer(cID, ctx.Players.Alive[cID.Index()].CurrentSpaceID, dist)
+       for {
+               dist := ctx.Turn.MoveQueue[0]
+               ctx.Turn.MoveQueue = ctx.Turn.MoveQueue[1:]
+               ctx.AdvancePlayer(cID, ctx.Players.Alive[cID.Index()].CurrentSpaceID, dist)
+               ctx.ProcessLanding()
+               if len(ctx.Turn.MoveQueue) == 0 {
+                       break
+               }
 
-       ctx.ProcessLanding()
+       }
 
 }
 

diff --git a/game/railroad.go b/game/railroad.go
index f3ba9f0952930df06a086d84230c60aefcfa6c74..fc1c99b0cd48da70efaf845122d4bed345dce253 100644 (file)
--- a/game/railroad.go
+++ b/game/railroad.go
@@ -25,7 +25,11 @@ func (ctx *Context) numRailroadOwned(playerID PlayerID) int32 {
 }
 
 func (ctx *Context) ProcessOwnedRailroad() {
-       for _, oRV := range ctx.Visitors.Railroad {
+       for {
+               oRV, done := QueuePop(&ctx.Visitors.Railroad)
+               if done {
+                       break
+               }
                visitorID := oRV.VisitorID
                ownerID := oRV.OwnerID
                // railroadID := oRV.railroadID

diff --git a/game/tax.go b/game/tax.go
index 6ab8b4d4c8d900805abeb0c0fbf03dc397c5ec7b..a6ad530b3283a6c8c9c58d5ef83ac045d8337149 100644 (file)
--- a/game/tax.go
+++ b/game/tax.go
@@ -1,7 +1,11 @@
 package game
 
 func (ctx *Context) ProcessTax() {
-       for _, tV := range ctx.Visitors.Tax {
+       for {
+               tV, done := QueuePop(&ctx.Visitors.Tax)
+               if done {
+                       break
+               }
                playerID := tV.VisitorID
                taxID := tV.TaxID
                ctx.AdjustPlayerMoney(playerID, -TaxSpaces[taxID].Amount)

diff --git a/game/types.go b/game/types.go
index 1e589dd9d48776a20e13474481cb31a62c431836..e0c5b6d7bf7af56ab91d5d7c5e8958b80c10f362 100644 (file)
--- a/game/types.go
+++ b/game/types.go
@@ -25,6 +25,20 @@ func (ctx *Context) EventPop() EventType {
        return last
 }
 
+// first, done
+func QueuePop[T any](q *[]T) (T, bool) {
+       if len(*q) == 0 {
+               var zero T
+               return zero, true
+       }
+
+       lastIdx := len(*q) - 1
+
+       first := (*q)[lastIdx]
+       *q = (*q)[:lastIdx]
+       return first, false
+}
+
 type Space struct {
        PropertyType PropertyType
        SubIndexID   int32 // FK to resp. OwnableProperty types

diff --git a/game/unowned.go b/game/unowned.go
index c42ca867642e57ceb3b9722d531e78f4c11c429c..3c0b43a0d028ecb40c4851ed6b4cf02eb6c3b358 100644 (file)
--- a/game/unowned.go
+++ b/game/unowned.go
@@ -1,29 +1,11 @@
 package game
 
 func (ctx *Context) ProcessUnowned() {
-       // for _, uV := range ctx.Visitors.Unowned {
-       // visitorID := uV.visitorID
-       // propID := uV.propertyID
-
-       // prop := ctx.Properties.Owners[propID.Index()]
-
-       // TODO: trigger buy or auction
-
-       // spaceID := prop.SpaceID
-       // space := BoardSpaces[spaceID.Index()]
-       //
-       // var price int32 = 0
-       //
-       // switch space.PropertyType {
-       // case TypeColor:
-       //      price = ColorProperties[space.SubIndexID].Price
-       // case TypeUtility:
-       //      price = UtilityPrice
-       // case TypeRailroad:
-       //      price = RailroadPrice
-       // }
-       //
-       // ctx.AdjustPlayerMoney(visitorID, -price)
-
-       // }
+       for {
+               _, done := QueuePop(&ctx.Visitors.Unowned)
+               if done {
+                       break
+               }
+               ctx.Turn.EventStack = append(ctx.Turn.EventStack, EventLandUnowned)
+       }
 }

diff --git a/game/utility.go b/game/utility.go
index 14255c72b21b2d602a982e8efe364c3394927972..301e793817f21c16cae2048f34ef7b683f4fe4c6 100644 (file)
--- a/game/utility.go
+++ b/game/utility.go
@@ -25,7 +25,11 @@ func (ctx *Context) NumUtilities(playerID PlayerID) int32 {
 }
 
 func (ctx *Context) ProcessOwnedUtility() {
-       for _, oUV := range ctx.Visitors.Utility {
+       for {
+               oUV, done := QueuePop(&ctx.Visitors.Utility)
+               if done {
+                       break
+               }
                visitorID := oUV.VisitorID
                ownerID := oUV.OwnerID
                // utilityID := oUV.utilityID