Support speed game item automatically (#57)

* Support speed game item automatically

* Support using speed game item

* Fix dependency issue

Co-authored-by: Yijia Chen <[email protected]>
Co-authored-by: Harry Liu <[email protected]>

Author: 3 people

game/gameitem/gameitem.go

@@ -88,9 +88,11 @@ func (p Power) GetType() Type {
 var _ GameItem = (*Speed)(nil)
 
 type Speed struct {
+	pubSub *pubsub.PubSub
 }
 
 func (p Speed) Use() {
+	p.pubSub.Publish(pubsub.IncreasePlayerSpeed, 2)
 }
 
 func (p Speed) GetType() Type {
@@ -141,7 +143,9 @@ func WithPubSub(itemType Type, pubSub *pubsub.PubSub) GameItem {
 			pubSub: pubSub,
 		}
 	case SpeedType:
-		return Speed{}
+		return Speed{
+			pubSub: pubSub,
+		}
 	case CandyType:
 		return Candy{}
 	case FirstAidKitType:

game/player/character.go

@@ -3,59 +3,77 @@ package player
 type character struct {
 	walkCycleOffset walkCycleOffset
 	initialPower    int
+	initialStepSize int
 }
 
 var BlackBoy = character{
 	walkCycleOffset: walkCycleOffset{
 		x: 0,
 		y: spriteColHeight,
 	},
-	initialPower: 1,
+	initialStepSize: 4,
+	initialPower:    1,
 }
+
 var BlackGirl = character{
 	walkCycleOffset: walkCycleOffset{
 		x: 0,
 		y: 0,
 	},
-	initialPower: 1,
+	initialStepSize: 4,
+	initialPower:    1,
 }
+
 var BrownBoy = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth,
 		y: spriteColHeight,
-	}}
+	},
+	initialStepSize: 6,
+	initialPower:    1,
+}
+
 var BrownGirl = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth,
 		y: 0,
 	},
-	initialPower: 1,
+	initialStepSize: 6,
+	initialPower:    1,
 }
+
 var YellowBoy = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth * 2,
 		y: spriteColHeight,
 	},
-	initialPower: 1,
+	initialStepSize: 6,
+	initialPower:    1,
 }
+
 var YellowGirl = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth * 2,
 		y: 0,
 	},
-	initialPower: 1,
+	initialStepSize: 6,
+	initialPower:    1,
 }
+
 var OrangeBoy = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth * 3,
 		y: spriteColHeight,
 	},
-	initialPower: 1,
+	initialStepSize: 6,
+	initialPower:    1,
 }
+
 var OrangeGirl = character{
 	walkCycleOffset: walkCycleOffset{
 		x: spriteRowWidth * 3,
 		y: 0,
 	},
-	initialPower: 1,
+	initialStepSize: 6,
+	initialPower:    1,
 }

game/player/player.go

@@ -98,6 +98,10 @@ func (p *Player) IncreasePowerLevel(amountIncrease int) {
 	p.state.increasePowerLevel(amountIncrease)
 }
 
+func (p *Player) IncreaseStepSize(amountIncrease int) {
+	p.state.increaseStepSize(amountIncrease)
+}
+
 func NewPlayer(
 	moveChecker MoveChecker,
 	character character,

game/player/standing.go

@@ -55,6 +55,7 @@ func newStandingStateOnSquare(
 			y:            gridY + row*square.Width,
 			regionOffset: regionOffset,
 			powerLevel:   character.initialPower,
+			stepSize:     character.initialStepSize,
 			character:    character,
 			pubSub:       pubSub,
 		},

game/player/state.go

@@ -20,6 +20,7 @@ type state interface {
 	getWidth() int
 	getHeight() int
 	increasePowerLevel(amountIncrease int)
+	increaseStepSize(amountIncrease int)
 	isNormal() bool
 }
 
@@ -33,6 +34,7 @@ type sharedState struct {
 	moveChecker  MoveChecker
 	regionOffset regionOffset
 	powerLevel   int
+	stepSize     int
 	character    character
 	pubSub       *pubsub.PubSub
 }
@@ -77,6 +79,10 @@ func (s *sharedState) increasePowerLevel(amountIncrease int) {
 	s.powerLevel += amountIncrease
 }
 
+func (s *sharedState) increaseStepSize(amountIncrease int) {
+	s.stepSize += amountIncrease
+}
+
 func (s sharedState) dropCandy() {
 	s.pubSub.Publish(pubsub.OnDropCandy, pubsub.OnDropCandyPayload{
 		X:          s.x,

game/player/walking.go

@@ -4,7 +4,6 @@ import (
 	"time"
 
 	"candy/game/direction"
-	"candy/game/square"
 	"candy/input"
 	"candy/pubsub"
 )
@@ -17,8 +16,7 @@ var _ state = (*walkingState)(nil)
 
 type walkingState struct {
 	*sharedState
-	stepSize int
-	lag      int64
+	lag int64
 }
 
 func (w *walkingState) update(timeElapsed time.Duration) {
@@ -102,7 +100,6 @@ func newWalkingState(shared *sharedState, lag int64, direction direction.Directi
 	return &walkingState{
 		sharedState: shared,
 		lag:         lag,
-		stepSize:    square.Width / 10,
 	}
 }
 

graphics/window.go

@@ -4,17 +4,10 @@ import (
 	"time"
 
 	"candy/input"
-
 	"github.com/hajimehoshi/ebiten/v2"
 	"github.com/hajimehoshi/ebiten/v2/inpututil"
 )
 
-type Window interface {
-	IsClosed() bool
-	PollEvents() []input.Input
-	Redraw()
-}
-
 type WindowConfig struct {
 	Width  int
 	Height int
@@ -92,9 +85,9 @@ func (e EbitenWindow) pollEvents() []input.Input {
 			Device: input.DownArrowKey,
 		})
 	}
-	if ebiten.IsKeyPressed(ebiten.KeyR) {
+	if inpututil.IsKeyJustPressed(ebiten.KeyR) {
 		inputs = append(inputs, input.Input{
-			Action: input.Press,
+			Action: input.SinglePress,
 			Device: input.RKey,
 		})
 	}

pubsub/topics.go

@@ -6,6 +6,7 @@ const (
 	OnCandyExploding topic = iota
 	OnPlayerWalking
 	IncreasePlayerPower
+	IncreasePlayerSpeed
 	OnDropCandy
 )
 

screen/game.go

@@ -1,11 +1,11 @@
 package screen
 
 import (
-	"candy/game/candy"
 	"time"
 
 	"candy/assets"
 	"candy/game"
+	"candy/game/candy"
 	"candy/game/cell"
 	"candy/game/gameitem"
 	"candy/game/gamemap"
@@ -57,7 +57,7 @@ func (g Game) HandleInput(in input.Input) {
 		case input.RKey:
 			g.gameMap.HideItems()
 		}
-	case input.Press:
+	case input.SinglePress:
 		switch in.Device {
 		case input.RKey:
 			g.gameMap.RevealItems()
@@ -117,6 +117,10 @@ func (g Game) increasePlayerPower(amountIncrease int) {
 	g.players[g.currPlayerIndex].IncreasePowerLevel(amountIncrease)
 }
 
+func (g Game) increaseStepSize(amountIncrease int) {
+	g.players[g.currPlayerIndex].IncreaseStepSize(amountIncrease)
+}
+
 func NewGame(
 	logger *observability.Logger,
 	assets assets.Assets, g graphics.Graphics,
@@ -167,5 +171,9 @@ func NewGame(
 		powerLevel := payload.(int)
 		gm.increasePlayerPower(powerLevel)
 	})
+	pubSub.Subscribe(pubsub.IncreasePlayerSpeed, func(payload interface{}) {
+		stepSizeDelta := payload.(int)
+		gm.increaseStepSize(stepSizeDelta)
+	})
 	return &gm
 }