diego/survive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
iegod
2024-11-08 07:29:34 -05:00
parent 8bf6e56398
commit b4287ad61e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game.go
View File

@@ -368,7 +368,7 @@ func (g *Game) UpdateProjectiles() {
func (g *Game) UpdateTargets() { func (g *Game) UpdateTargets() {
for _, target := range g.targets { for _, target := range g.targets {
if !target.Hit && g.hero.Action < MoverActionDying { if !target.Hit && g.hero.Action < HeroActionDying {
dx := g.hero.Pos.X - target.Pos.X dx := g.hero.Pos.X - target.Pos.X
dy := g.hero.Pos.Y - target.Pos.Y dy := g.hero.Pos.Y - target.Pos.Y
angle := math.Atan2(dy, dx) angle := math.Atan2(dy, dx)
@@ -380,7 +380,7 @@ func (g *Game) UpdateTargets() {
} }
//compute collision with hero //compute collision with hero
if g.hero.Pos.X >= target.Pos.X-MOVER_WIDTH/2 && g.hero.Pos.X <= target.Pos.X+MOVER_WIDTH/2 && g.hero.Pos.Y >= target.Pos.Y-MOVER_HEIGHT/2 && g.hero.Pos.Y <= target.Pos.Y+MOVER_HEIGHT/2 && target.Action < MoverActionDying && g.hero.Action < MoverActionDying { if g.hero.Pos.X >= target.Pos.X-MOVER_WIDTH/2 && g.hero.Pos.X <= target.Pos.X+MOVER_WIDTH/2 && g.hero.Pos.Y >= target.Pos.Y-MOVER_HEIGHT/2 && g.hero.Pos.Y <= target.Pos.Y+MOVER_HEIGHT/2 && target.Action < MoverActionDying && g.hero.Action < HeroActionDying {
g.heroCollisionMask.Clear() g.heroCollisionMask.Clear()
g.heroCollisionMask.DrawImage(g.hero.Sprite, nil) g.heroCollisionMask.DrawImage(g.hero.Sprite, nil)

8
hero.go
View File

@@ -68,9 +68,9 @@ type Hero struct {
func NewHero() *Hero { func NewHero() *Hero {
m := &Hero{ m := &Hero{
Sprite: ebiten.NewImage(48, 48), Sprite: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
Maks: ebiten.NewImage(48, 48), Maks: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
MaksDest: ebiten.NewImage(48, 48), MaksDest: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
Action: HeroActionDefault, Action: HeroActionDefault,
cycles: 4, cycles: 4,
Angle: 0, Angle: 0,
@@ -139,7 +139,7 @@ func (m *Hero) Update() {
// one hit death for the hero // one hit death for the hero
func (m *Hero) SetHit() { func (m *Hero) SetHit() {
m.Action = MoverActionDying m.Action = HeroActionDying
m.dyingcount = 0 m.dyingcount = 0
m.Angle = 0 m.Angle = 0
m.cycles = 0 m.cycles = 0

6
mover.go
View File

@@ -83,9 +83,9 @@ type Mover struct {
func NewMover() *Mover { func NewMover() *Mover {
m := &Mover{ m := &Mover{
Sprite: ebiten.NewImage(48, 48), Sprite: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
Maks: ebiten.NewImage(48, 48), Maks: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
MaksDest: ebiten.NewImage(48, 48), MaksDest: ebiten.NewImage(MOVER_WIDTH, MOVER_HEIGHT),
Action: MoverActionDefault, Action: MoverActionDefault,
cycles: 4, cycles: 4,
Angle: 0, Angle: 0,