-
Notifications
You must be signed in to change notification settings - Fork 41
DRAFT: Use accessors for mob/player stats #415
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Jasrags
wants to merge
12
commits into
master
Choose a base branch
from
210-use-accessors-for-mobplayer-stats
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
f3c7cd9
Initial pass on changing StatInfo to be accessed by Get accessor
Jasrags beb7d02
Change stats command to use accessors, more cleanup needed
Jasrags b40bb4d
Update status train to use the accessor
Jasrags e40a7b3
Added some new template functions to expose the character statinfo va…
Jasrags 0fb5a21
Added iteration on repetitive get calls
Jasrags de2c4c2
Converted more code to use Get stat
Jasrags 75f2c61
Apply changes needed for Delta ValueAdj use cases
Jasrags 24cf5e9
Next round of changes, moved to loading stats from config
Jasrags 242991b
Added in config file for stats
Jasrags b2f67bf
removed comment
Jasrags d7b91a0
removed comments
Jasrags 11ea3e5
Added comment back
Jasrags File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -206,7 +206,7 @@ func (c *Character) GetBaseCastSuccessChance(spellId string) int { | |
| } | ||
| targetNumber += proficiency | ||
|
|
||
| targetNumber += int(math.Floor(float64(c.Stats.Mysticism.ValueAdj) / 5)) | ||
| targetNumber += int(math.Floor(float64(c.Stats.Get("Mysticism").ValueAdj) / 5)) | ||
|
|
||
| // add by any stat mods for casting, or casting school | ||
| // 0-xx | ||
|
|
@@ -222,7 +222,7 @@ func (c *Character) GetBaseCastSuccessChance(spellId string) int { | |
| } | ||
|
|
||
| func (c *Character) CarryCapacity() int { | ||
| return 5 + c.Stats.Strength.ValueAdj/3 | ||
| return 5 + c.Stats.Get("Strength").ValueAdj/3 | ||
| } | ||
|
|
||
| func (c *Character) DeductActionPoints(amount int) bool { | ||
|
|
@@ -367,9 +367,9 @@ func (c *Character) GetDefaultDiceRoll() (attacks int, dCount int, dSides int, b | |
| bonus = raceInfo.Damage.BonusDamage | ||
| buffOnCrit = raceInfo.Damage.CritBuffIds | ||
|
|
||
| dCount += int(math.Floor((float64(c.Stats.Speed.ValueAdj) / 50))) | ||
| dSides += int(math.Floor((float64(c.Stats.Strength.ValueAdj) / 12))) | ||
| bonus += int(math.Floor((float64(c.Stats.Perception.ValueAdj) / 25))) | ||
| dCount += int(math.Floor((float64(c.Stats.Get("Speed").ValueAdj) / 50))) | ||
| dSides += int(math.Floor((float64(c.Stats.Get("Strength").ValueAdj) / 12))) | ||
| bonus += int(math.Floor((float64(c.Stats.Get("Perception").ValueAdj) / 25))) | ||
|
|
||
| if dCount < raceInfo.Damage.DiceCount { | ||
| dCount = raceInfo.Damage.DiceCount | ||
|
|
@@ -958,15 +958,15 @@ func (c *Character) GetMaxCharmedCreatures() int { | |
| } | ||
|
|
||
| func (c *Character) GetMemoryCapacity() int { | ||
| memCap := c.GetSkillLevel(skills.Map) * c.Stats.Smarts.ValueAdj | ||
| memCap := c.GetSkillLevel(skills.Map) * c.Stats.Get("Smarts").ValueAdj | ||
| if memCap < 0 { | ||
| memCap = 0 | ||
| } | ||
| return memCap + 5 | ||
| } | ||
|
|
||
| func (c *Character) GetMapSprawlCapacity() int { | ||
| sprawlCap := c.GetSkillLevel(skills.Map) + (c.Stats.Smarts.ValueAdj >> 2) | ||
| sprawlCap := c.GetSkillLevel(skills.Map) + (c.Stats.Get("Smarts").ValueAdj >> 2) | ||
| if sprawlCap < 0 { | ||
| sprawlCap = 0 | ||
| } | ||
|
|
@@ -1256,7 +1256,7 @@ func (c *Character) ApplyManaChange(manaChange int) int { | |
| } | ||
|
|
||
| func (c *Character) BarterPrice(startPrice int) int { | ||
| factor := (float64(c.Stats.Perception.ValueAdj) / 3) / 100 // 100 = 33% discount, 0 = 0% discount, 300 = 100% discount | ||
| factor := (float64(c.Stats.Get("Perception").ValueAdj) / 3) / 100 // 100 = 33% discount, 0 = 0% discount, 300 = 100% discount | ||
| if factor > .75 { | ||
| factor = .75 | ||
| } | ||
|
|
@@ -1308,12 +1308,12 @@ func (c *Character) LevelUp() (bool, stats.Statistics) { | |
|
|
||
| var statsDelta stats.Statistics = c.Stats | ||
|
|
||
| statsDelta.Strength.Value -= statsBefore.Strength.Value | ||
| statsDelta.Speed.Value -= statsBefore.Speed.Value | ||
| statsDelta.Smarts.Value -= statsBefore.Smarts.Value | ||
| statsDelta.Vitality.Value -= statsBefore.Vitality.Value | ||
| statsDelta.Mysticism.Value -= statsBefore.Mysticism.Value | ||
| statsDelta.Perception.Value -= statsBefore.Perception.Value | ||
| statsDelta.Get("Strength").Value -= statsBefore.Get("Strength").Value | ||
| statsDelta.Get("Speed").Value -= statsBefore.Get("Speed").Value | ||
| statsDelta.Get("Smarts").Value -= statsBefore.Get("Smarts").Value | ||
| statsDelta.Get("Vitality").Value -= statsBefore.Get("Vitality").Value | ||
| statsDelta.Get("Mysticism").Value -= statsBefore.Get("Mysticism").Value | ||
| statsDelta.Get("Perception").Value -= statsBefore.Get("Perception").Value | ||
|
|
||
| c.Health = c.HealthMax.Value | ||
| c.Mana = c.ManaMax.Value | ||
|
|
@@ -1340,7 +1340,7 @@ func (c *Character) Heal(hp int, mana int) (int, int) { | |
| func (c *Character) HealthPerRound() int { | ||
| return 1 + c.StatMod(string(statmods.HealthRecovery)) | ||
| /* | ||
| healAmt := math.Round(float64(c.Stats.Vitality.ValueAdj)/8) + | ||
| healAmt := math.Round(float64(c.Stats.Get("Vitality").ValueAdj)/8) + | ||
| math.Round(float64(c.Level)/12) + | ||
| 1.0 | ||
|
|
||
|
|
@@ -1351,7 +1351,7 @@ func (c *Character) HealthPerRound() int { | |
| func (c *Character) ManaPerRound() int { | ||
| return 1 + c.StatMod(string(statmods.ManaRecovery)) | ||
| /* | ||
| healAmt := math.Round(float64(c.Stats.Mysticism.ValueAdj)/8) + | ||
| healAmt := math.Round(float64(c.Stats.Get("Mysticism").ValueAdj)/8) + | ||
| math.Round(float64(c.Level)/12) + | ||
| 1.0 | ||
|
|
||
|
|
@@ -1361,9 +1361,9 @@ func (c *Character) ManaPerRound() int { | |
|
|
||
| // Where 1000 = a full round | ||
| func (c *Character) MovementCost() int { | ||
| modifier := 3 // by default they should be able to move 3 times per round. | ||
| modifier += int(c.Level / 15) // Every 15 levels, get an extra movement. | ||
| modifier += int(c.Stats.Speed.ValueAdj / 15) // Every 15 speed, get an extra movement | ||
| modifier := 3 // by default they should be able to move 3 times per round. | ||
| modifier += int(c.Level / 15) // Every 15 levels, get an extra movement. | ||
| modifier += int(c.Stats.Get("Speed").ValueAdj / 15) // Every 15 speed, get an extra movement | ||
| return int(1000 / modifier) | ||
| } | ||
|
|
||
|
|
@@ -1372,6 +1372,8 @@ func (c *Character) StatMod(statName string) int { | |
| } | ||
|
|
||
| // returns true if something has changed. | ||
| // TODO: [nitpick] There are many repetitive Get("X") calls; consider iterating over a slice of stat names or using a helper to apply updates in a loop for readability. | ||
|
||
|
|
||
| func (c *Character) RecalculateStats() { | ||
|
|
||
| // Make sure racial base stats are set | ||
|
|
@@ -1385,43 +1387,52 @@ func (c *Character) RecalculateStats() { | |
| if c.TNLScale == 0 { | ||
| c.TNLScale = 1.0 | ||
| } | ||
| c.Stats.Strength.Base = raceInfo.Stats.Strength.Base | ||
| c.Stats.Speed.Base = raceInfo.Stats.Speed.Base | ||
| c.Stats.Smarts.Base = raceInfo.Stats.Smarts.Base | ||
| c.Stats.Vitality.Base = raceInfo.Stats.Vitality.Base | ||
| c.Stats.Mysticism.Base = raceInfo.Stats.Mysticism.Base | ||
| c.Stats.Perception.Base = raceInfo.Stats.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.Strength.Mods = c.StatMod(string(statmods.Strength)) | ||
| c.Stats.Speed.Mods = c.StatMod(string(statmods.Speed)) | ||
| c.Stats.Smarts.Mods = c.StatMod(string(statmods.Smarts)) | ||
| c.Stats.Vitality.Mods = c.StatMod(string(statmods.Vitality)) | ||
| c.Stats.Mysticism.Mods = c.StatMod(string(statmods.Mysticism)) | ||
| c.Stats.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.Strength.Recalculate(c.Level) | ||
| c.Stats.Speed.Recalculate(c.Level) | ||
| c.Stats.Smarts.Recalculate(c.Level) | ||
| c.Stats.Vitality.Recalculate(c.Level) | ||
| c.Stats.Mysticism.Recalculate(c.Level) | ||
| c.Stats.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 | ||
| c.HealthMax.Mods = 5 + | ||
| c.StatMod(string(statmods.HealthMax)) + // Any sort of spell buffs etc. are just direct modifiers | ||
| c.Level + // For every level you get 1 hp | ||
| c.Stats.Vitality.ValueAdj*4 // for every vitality you get 3hp | ||
| c.Stats.Get("Vitality").ValueAdj*4 // for every vitality you get 3hp | ||
|
|
||
| c.ManaMax.Mods = 4 + | ||
| c.StatMod(string(statmods.ManaMax)) + // Any sort of spell buffs etc. are just direct modifiers | ||
| c.Level + // For every level you get 1 mp | ||
| c.Stats.Mysticism.ValueAdj*3 // for every Mysticism you get 2mp | ||
| c.Stats.Get("Mysticism").ValueAdj*3 // for every Mysticism you get 2mp | ||
|
|
||
| // Set max action points | ||
| c.ActionPointsMax.Mods = 200 // hard coded for now | ||
|
|
@@ -1445,22 +1456,16 @@ func (c *Character) RecalculateStats() { | |
| if c.userId != 0 { | ||
| changed := false | ||
| // return true if something has changed. | ||
| if beforeStats.Strength.ValueAdj != c.Stats.Strength.ValueAdj { | ||
| changed = true | ||
| } else if beforeStats.Speed.ValueAdj != c.Stats.Speed.ValueAdj { | ||
| changed = true | ||
| } else if beforeStats.Smarts.ValueAdj != c.Stats.Smarts.ValueAdj { | ||
| changed = true | ||
| } else if beforeStats.Vitality.ValueAdj != c.Stats.Vitality.ValueAdj { | ||
| changed = true | ||
| } else if beforeStats.Mysticism.ValueAdj != c.Stats.Mysticism.ValueAdj { | ||
| changed = true | ||
| } else if beforeStats.Perception.ValueAdj != c.Stats.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 { | ||
|
|
@@ -1481,17 +1486,17 @@ func (c *Character) AutoTrain() { | |
|
|
||
| switch util.Rand(6) { | ||
| case 0: | ||
| c.Stats.Strength.Training++ | ||
| c.Stats.Get("Strength").Training++ | ||
| case 1: | ||
| c.Stats.Speed.Training++ | ||
| c.Stats.Get("Speed").Training++ | ||
| case 2: | ||
| c.Stats.Smarts.Training++ | ||
| c.Stats.Get("Smarts").Training++ | ||
| case 3: | ||
| c.Stats.Vitality.Training++ | ||
| c.Stats.Get("Vitality").Training++ | ||
| case 4: | ||
| c.Stats.Mysticism.Training++ | ||
| c.Stats.Get("Mysticism").Training++ | ||
| case 5: | ||
| c.Stats.Perception.Training++ | ||
| c.Stats.Get("Perception").Training++ | ||
| } | ||
|
|
||
| c.StatPoints-- | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| package stats | ||
|
|
||
| import "math" | ||
| import ( | ||
| "math" | ||
| "strings" | ||
| ) | ||
|
|
||
| const ( | ||
| BaseModFactor = 0.3333333334 // How much of a scaling to aply to levels before multiplying by racial stat | ||
|
|
@@ -16,6 +19,48 @@ type Statistics struct { | |
| Perception StatInfo `yaml:"perception,omitempty"` // How well you notice things | ||
| } | ||
|
|
||
| // GetStatInfoNames returns a list of all stat names in the order they are defined. | ||
| // TODO: This should be a representation of the stats in the game, not hardcoded. | ||
| func (s *Statistics) GetStatInfoNames() []string { | ||
Jasrags marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| names := []string{ | ||
| "Strength", | ||
| "Speed", | ||
| "Smarts", | ||
| "Vitality", | ||
| "Mysticism", | ||
| "Perception", | ||
| } | ||
| return names | ||
| } | ||
|
|
||
| // Get returns a pointer to the StatInfo for the given name. | ||
| func (s *Statistics) Get(name string) *StatInfo { | ||
| 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 © | ||
| // } | ||
|
|
||
| switch key { | ||
| case "strength": | ||
| return &s.Strength | ||
| case "speed": | ||
| return &s.Speed | ||
| case "smarts": | ||
| return &s.Smarts | ||
| case "vitality": | ||
| return &s.Vitality | ||
| case "mysticism": | ||
| return &s.Mysticism | ||
| case "perception": | ||
| return &s.Perception | ||
| } | ||
|
|
||
| return &StatInfo{} | ||
| } | ||
|
|
||
| // When saving to a file, we don't need to write all the properties that we calculate. | ||
| // Just keep track of "Training" because that's not calculated. | ||
| type StatInfo struct { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling
Get("Mysticism")inside hot loops involves string lookups and a switch; consider caching the StatInfo pointer in a local variable to reduce overhead.