shop fixes, 'toggle' completely removed, movement speed increased

1 files changed, 6 insertions, 12 deletions

diff --git a/internal/game/action_agility.go b/internal/game/action_agility.go
index 089f026..37fbab9 100644
--- a/internal/game/action_agility.go
+++ b/internal/game/action_agility.go
@@ -68,7 +68,7 @@ func (g *Game) advanceObstacle(sess *net.Session, p *player.Player) {
 	ticksPerPhase := data["ticks_per_phase"].(float64)
 
 	if phase >= len(messages) {
-		g.CancelAction(p)
+		g.cancelAction(p)
 		return
 	}
 
@@ -95,10 +95,7 @@ func (g *Game) advanceObstacle(sess *net.Session, p *player.Player) {
 		courseID := data["course_id"].(string)
 
 		if obstacleXP > 0 {
-			if newLevel := p.AddSkillXP(player.Agility, obstacleXP); newLevel > 0 {
-				sess.WriteLine(g.colorize(sess, "level_up",
-					fmt.Sprintf("*** You are now level %d agility! ***", newLevel)))
-			}
+			g.awardSkillXP(sess, p, player.Agility, obstacleXP)
 			if p.OptionBool("xp_drops") {
 				sess.WriteLine(g.colorize(sess, "xp",
 					fmt.Sprintf("(+%dxp %s)", obstacleXP, player.SkillAbbr[player.Agility])))
@@ -109,10 +106,7 @@ func (g *Game) advanceObstacle(sess *net.Session, p *player.Player) {
 
 		if isLastObstacle {
 			if completionXP > 0 {
-				if newLevel := p.AddSkillXP(player.Agility, completionXP); newLevel > 0 {
-					sess.WriteLine(g.colorize(sess, "level_up",
-						fmt.Sprintf("*** You are now level %d agility! ***", newLevel)))
-				}
+				g.awardSkillXP(sess, p, player.Agility, completionXP)
 				if p.OptionBool("xp_drops") {
 					sess.WriteLine(g.colorize(sess, "xp",
 						fmt.Sprintf("(+%dxp %s course bonus)", completionXP, player.SkillAbbr[player.Agility])))
@@ -127,10 +121,10 @@ func (g *Game) advanceObstacle(sess *net.Session, p *player.Player) {
 			sess.WriteLine(g.colorize(sess, "broadcast",
 				fmt.Sprintf("Course complete! %s lap %d finished.", courseName, laps)))
 
-			g.CancelAction(p)
+			g.cancelAction(p)
 			g.teleportPlayer(sess, p, startRoom)
 		} else {
-			g.CancelAction(p)
+			g.cancelAction(p)
 			g.teleportPlayer(sess, p, nextRoom)
 		}
 
@@ -162,7 +156,7 @@ func (g *Game) obstacleFail(sess *net.Session, p *player.Player, data map[string
 		fmt.Sprintf("You take %d damage. HP: %d/%d", damage, p.HP, p.MaxHP())))
 
 	g.AccountStore.SaveCharacter(p)
-	g.CancelAction(p)
+	g.cancelAction(p)
 	g.teleportPlayer(sess, p, startRoom)
 }