Increase length of punch and kick animations

This commit is contained in:
Trevor Slocum 2023-01-31 21:18:47 -08:00
parent fe2797dd84
commit 1aa0cc9912
3 changed files with 53 additions and 6 deletions

View File

@ -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)),
},

View File

@ -84,6 +84,8 @@ func (g *Game) reset() {
botTauntTicks = 0
botTauntTotalTicks = 0
g.playerStateUpdated()
}
func (g *Game) Layout(_, _ int) (screenWidth, screenHeight int) {

View File

@ -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)
}