Added iteration on repetitive get calls

Author: Jasrags

internal/characters/character.go

@@ -1387,31 +1387,40 @@ func (c *Character) RecalculateStats() {
 		if c.TNLScale == 0 {
 			c.TNLScale = 1.0
 		}
-		c.Stats.Get("Strength").Base = raceInfo.Stats.Get("Strength").Base
-		c.Stats.Get("Speed").Base = raceInfo.Stats.Get("Speed").Base
-		c.Stats.Get("Smarts").Base = raceInfo.Stats.Get("Smarts").Base
-		c.Stats.Get("Vitality").Base = raceInfo.Stats.Get("Vitality").Base
-		c.Stats.Get("Mysticism").Base = raceInfo.Stats.Get("Mysticism").Base
-		c.Stats.Get("Perception").Base = raceInfo.Stats.Get("Perception").Base
+		for _, statName := range c.Stats.GetStatInfoNames() {
+			c.Stats.Get(statName).Base = raceInfo.Stats.Get(statName).Base
+		}
+		// c.Stats.Get("Strength").Base = raceInfo.Stats.Get("Strength").Base
+		// c.Stats.Get("Speed").Base = raceInfo.Stats.Get("Speed").Base
+		// c.Stats.Get("Smarts").Base = raceInfo.Stats.Get("Smarts").Base
+		// c.Stats.Get("Vitality").Base = raceInfo.Stats.Get("Vitality").Base
+		// c.Stats.Get("Mysticism").Base = raceInfo.Stats.Get("Mysticism").Base
+		// c.Stats.Get("Perception").Base = raceInfo.Stats.Get("Perception").Base
 	}
 
 	// Add any mods for equipment
-	c.Stats.Get("Strength").Mods = c.StatMod(string(statmods.Strength))
-	c.Stats.Get("Speed").Mods = c.StatMod(string(statmods.Speed))
-	c.Stats.Get("Smarts").Mods = c.StatMod(string(statmods.Smarts))
-	c.Stats.Get("Vitality").Mods = c.StatMod(string(statmods.Vitality))
-	c.Stats.Get("Mysticism").Mods = c.StatMod(string(statmods.Mysticism))
-	c.Stats.Get("Perception").Mods = c.StatMod(string(statmods.Perception))
+	for _, statName := range c.Stats.GetStatInfoNames() {
+		c.Stats.Get(statName).Mods = c.StatMod(statName)
+	}
+	// c.Stats.Get("Strength").Mods = c.StatMod(string(statmods.Strength))
+	// c.Stats.Get("Speed").Mods = c.StatMod(string(statmods.Speed))
+	// c.Stats.Get("Smarts").Mods = c.StatMod(string(statmods.Smarts))
+	// c.Stats.Get("Vitality").Mods = c.StatMod(string(statmods.Vitality))
+	// c.Stats.Get("Mysticism").Mods = c.StatMod(string(statmods.Mysticism))
+	// c.Stats.Get("Perception").Mods = c.StatMod(string(statmods.Perception))
 
 	// Recalculate stats
 	// Stats are basically:
 	// level*base + training + mods
-	c.Stats.Get("Strength").Recalculate(c.Level)
-	c.Stats.Get("Speed").Recalculate(c.Level)
-	c.Stats.Get("Smarts").Recalculate(c.Level)
-	c.Stats.Get("Vitality").Recalculate(c.Level)
-	c.Stats.Get("Mysticism").Recalculate(c.Level)
-	c.Stats.Get("Perception").Recalculate(c.Level)
+	for _, statName := range c.Stats.GetStatInfoNames() {
+		c.Stats.Get(statName).Recalculate(c.Level)
+	}
+	// c.Stats.Get("Strength").Recalculate(c.Level)
+	// c.Stats.Get("Speed").Recalculate(c.Level)
+	// c.Stats.Get("Smarts").Recalculate(c.Level)
+	// c.Stats.Get("Vitality").Recalculate(c.Level)
+	// c.Stats.Get("Mysticism").Recalculate(c.Level)
+	// c.Stats.Get("Perception").Recalculate(c.Level)
 
 	// Set HP/MP maxes
 	// This relies on the above stats so has to be calculated afterwards
@@ -1447,22 +1456,16 @@ func (c *Character) RecalculateStats() {
 	if c.userId != 0 {
 		changed := false
 		// return true if something has changed.
-		if beforeStats.Get("Strength").ValueAdj != c.Stats.Get("Strength").ValueAdj {
-			changed = true
-		} else if beforeStats.Get("Speed").ValueAdj != c.Stats.Get("Speed").ValueAdj {
-			changed = true
-		} else if beforeStats.Get("Smarts").ValueAdj != c.Stats.Get("Smarts").ValueAdj {
-			changed = true
-		} else if beforeStats.Get("Vitality").ValueAdj != c.Stats.Get("Vitality").ValueAdj {
-			changed = true
-		} else if beforeStats.Get("Mysticism").ValueAdj != c.Stats.Get("Mysticism").ValueAdj {
-			changed = true
-		} else if beforeStats.Get("Perception").ValueAdj != c.Stats.Get("Perception").ValueAdj {
-			changed = true
-		} else if beforeHealthMax != c.HealthMax {
-			changed = true
-		} else if beforeManaMax != c.ManaMax {
-			changed = true
+		for _, statName := range c.Stats.GetStatInfoNames() {
+			if beforeStats.Get(statName).ValueAdj != c.Stats.Get(statName).ValueAdj {
+				changed = true
+				break
+			}
+		}
+		if !changed {
+			if beforeHealthMax != c.HealthMax || beforeManaMax != c.ManaMax {
+				changed = true
+			}
 		}
 
 		if changed {

internal/stats/stats.go

@@ -35,7 +35,15 @@ func (s *Statistics) GetStatInfoNames() []string {
 
 // Get returns a pointer to the StatInfo for the given name.
 func (s *Statistics) Get(name string) *StatInfo {
-	switch strings.ToLower(name) {
+	key := strings.ToLower(name)
+
+	// TODO: When we load the stats from a file, we need to check the map
+	// if stat, ok := s.Stats[key]; ok {
+	// 	copy := stat
+	// 	return &copy
+	// }
+
+	switch key {
 	case "strength":
 		return &s.Strength
 	case "speed":
@@ -48,9 +56,9 @@ func (s *Statistics) Get(name string) *StatInfo {
 		return &s.Mysticism
 	case "perception":
 		return &s.Perception
-	default:
-		return &StatInfo{}
 	}
+
+	return &StatInfo{}
 }
 
 // When saving to a file, we don't need to write all the properties that we calculate.