changes player hit name again

ubclaunchpad · Jul 27, 2018 · 354045d · 354045d
1 parent 44f86de
commit 354045d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/server/arena/arena.go b/server/arena/arena.go
@@ -192,7 +192,7 @@ func (a *Arena) holeCollisions() {
 
 		for name, player := range a.Players {
 			if areCirclesColliding(player.Position, models.PlayerRadius, hole.Position, hole.Radius) {
-				playerScored := player.PlayerHitMe
+				playerScored := player.LastPlayerHit
 				if playerScored != nil {
 					playerScored.AddPoints(models.PointsPerPlayer)
 					go database.UpdatePlayerScore(playerScored)
@@ -210,7 +210,7 @@ func (a *Arena) holeCollisions() {
 
 		for i, junk := range a.Junk {
 			if areCirclesColliding(junk.Position, models.JunkRadius, hole.Position, hole.Radius) {
-				playerScored := junk.PlayerHitMe
+				playerScored := junk.LastPlayerHit
 				if playerScored != nil {
 					playerScored.AddPoints(models.PointsPerJunk)
 				}

diff --git a/server/models/junk.go b/server/models/junk.go
@@ -17,12 +17,12 @@ const (
 
 // Junk a position and velocity struct describing it's state and player struct to identify rewarding points
 type Junk struct {
-	Position    Position `json:"position"`
-	Velocity    Velocity `json:"-"`
-	Color       string   `json:"color"`
-	PlayerHitMe *Player  `json:"-"`
-	Debounce    int      `json:"-"`
-	jDebounce   int
+	Position      Position `json:"position"`
+	Velocity      Velocity `json:"-"`
+	Color         string   `json:"color"`
+	LastPlayerHit *Player  `json:"-"`
+	Debounce      int      `json:"-"`
+	jDebounce     int
 }
 
 // CreateJunk initializes and returns an instance of a Junk
@@ -72,7 +72,7 @@ func (j *Junk) HitBy(p *Player) {
 	}
 
 	j.Color = p.Color //Assign junk to last recently hit player color
-	j.PlayerHitMe = p
+	j.LastPlayerHit = p
 
 	if p.Velocity.Dx < 0 {
 		j.Velocity.Dx = math.Min(p.Velocity.Dx*BumpFactor, -MinimumBump)

diff --git a/server/models/player.go b/server/models/player.go
@@ -48,7 +48,7 @@ type Player struct {
 	Angle          float64     `json:"angle"`
 	Controls       KeysPressed `json:"-"`
 	Points         int         `json:"points"`
-	PlayerHitMe    *Player     `json:"-"`
+	LastPlayerHit  *Player     `json:"-"`
 	pointsDebounce int
 	pDebounce      int
 	mutex          sync.Mutex
@@ -150,7 +150,7 @@ func (p *Player) UpdatePosition(height float64, width float64) {
 	if p.pointsDebounce > 0 {
 		p.pointsDebounce--
 	} else {
-		p.PlayerHitMe = nil
+		p.LastPlayerHit = nil
 		p.pointsDebounce = 0
 	}
 }
@@ -176,8 +176,8 @@ func (p *Player) HitPlayer(ph *Player) {
 	ph.Velocity.Dx = (ph.Velocity.Dx * -VelocityTransferFactor) + (initalVelocity.Dx * VelocityTransferFactor)
 	ph.Velocity.Dy = (ph.Velocity.Dy * -VelocityTransferFactor) + (initalVelocity.Dy * VelocityTransferFactor)
 
-	ph.PlayerHitMe = p
-	p.PlayerHitMe = ph
+	ph.LastPlayerHit = p
+	p.LastPlayerHit = ph
 	p.pointsDebounce = PointsDebounceTicks
 	ph.pointsDebounce = PointsDebounceTicks
 	p.pDebounce = PlayerDebounceTicks