diff --git a/component/framedata.go b/component/framedata.go index 6efbf09..a93f326 100644 --- a/component/framedata.go +++ b/component/framedata.go @@ -108,6 +108,9 @@ var AllPlayerFrames = [][][]FrameData{ { stdHit(asset.FrameAt(asset.ImgPlayer, 2, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 2, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 3, 1)), }, @@ -117,12 +120,18 @@ var AllPlayerFrames = [][][]FrameData{ { stdHit(asset.FrameAt(asset.ImgPlayer, 5, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 5, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 6, 1)), }, { stdHit(asset.FrameAt(asset.ImgPlayer, 7, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 7, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 8, 1)), }, @@ -167,15 +176,36 @@ var AllPlayerFrames = [][][]FrameData{ { stdHit(asset.FrameAt(asset.ImgPlayer, 5, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 5, 1)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 5, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 4, 1)), }, { stdHit(asset.FrameAt(asset.ImgPlayer, 3, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 3, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 2, 1)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 2, 1)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 1, 1)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 1, 1)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 1, 1)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 1, 1)), }, @@ -253,15 +283,30 @@ var AllPlayerFrames = [][][]FrameData{ { stdHit(asset.FrameAt(asset.ImgPlayer, 6, 12)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 6, 12)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 5, 12)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 5, 12)), }, { stdHit(asset.FrameAt(asset.ImgPlayer, 4, 12)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 4, 12)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 3, 12)), }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 3, 12)), + }, + { + stdHit(asset.FrameAt(asset.ImgPlayer, 2, 12)), + }, { stdHit(asset.FrameAt(asset.ImgPlayer, 2, 12)), }, diff --git a/game/game.go b/game/game.go index 233383f..4b23246 100644 --- a/game/game.go +++ b/game/game.go @@ -84,6 +84,8 @@ func (g *Game) reset() { botTauntTicks = 0 botTauntTotalTicks = 0 + + g.playerStateUpdated() } func (g *Game) Layout(_, _ int) (screenWidth, screenHeight int) { diff --git a/game/inputs.go b/game/inputs.go index 96d7a61..7f05df5 100644 --- a/game/inputs.go +++ b/game/inputs.go @@ -130,12 +130,12 @@ func botInput() InputBits { const ( botMaxActionTime = 20 - botWaitChance = 3 + botWaitChance = 5 botPunchDistance = 25 - botKickDistance = 30 - botKickChance = 7 + botKickDistance = 25 + botKickChance = 4 botBlockDistance = 30 - botBlockTime = 25 + botBlockTime = 35 botBlockChance = 3 botTauntMinTime = 60 botTauntTime = 200 @@ -193,9 +193,9 @@ func botInput() InputBits { } if world.Winner == 0 { - if p.X < o.X { + if p.X < o.X && p.X < world.GroundWidth/2-component.PlayerWidth { input.setButtonOn(ButtonRight) - } else { + } else if p.X >= o.X && p.X > -world.GroundWidth/2 { input.setButtonOn(ButtonLeft) }