From 4dd69e7709bd7fe342b46474fd56a23e53673ae6 Mon Sep 17 00:00:00 2001 From: Stephen Horan <31539570+stephenhoran@users.noreply.github.com> Date: Sat, 31 Oct 2020 23:59:24 -0400 Subject: [PATCH] Health/Mana/Exp load values from save file #815 (#886) * Return errors for #790 * Fixing lint issues * Returning nil instead of empty struct pointer * Removed new hero stat calls as new player requires stats to be passed in. These were using defaults regardless of the save file. * Removed override on the default to health/mana/experience. These should now result is proper values. * Removed new hero stat calls as new player requires stats to be passed in. These were using defaults regardless of the save file. * Removed override on the default to health/mana/experience. These should now result is proper values. --- d2core/d2hero/hero_stats_state.go | 5 ----- d2core/d2map/d2mapentity/factory.go | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/d2core/d2hero/hero_stats_state.go b/d2core/d2hero/hero_stats_state.go index 9e1400e3..04ad52a4 100644 --- a/d2core/d2hero/hero_stats_state.go +++ b/d2core/d2hero/hero_stats_state.go @@ -55,10 +55,5 @@ func (f *HeroStateFactory) CreateHeroStatsState(heroClass d2enum.Hero, classStat result.Health = result.MaxHealth result.Stamina = float64(result.MaxStamina) - // https://github.com/OpenDiablo2/OpenDiablo2/issues/815 - result.Health = 50 - result.Mana = 30 - result.Experience = 166 - return &result } diff --git a/d2core/d2map/d2mapentity/factory.go b/d2core/d2map/d2mapentity/factory.go index af09952d..1e50d8cd 100644 --- a/d2core/d2map/d2mapentity/factory.go +++ b/d2core/d2map/d2mapentity/factory.go @@ -86,9 +86,7 @@ func (f *MapEntityFactory) NewPlayer(id, name string, x, y, direction int, heroT stats.NextLevelExp = f.asset.Records.GetExperienceBreakpoint(heroType, stats.Level) stats.Stamina = float64(stats.MaxStamina) - defaultCharStats := f.asset.Records.Character.Stats[heroType] - statsState := f.HeroStateFactory.CreateHeroStatsState(heroType, defaultCharStats) - heroState, _ := f.CreateHeroState(name, heroType, statsState) + heroState, _ := f.CreateHeroState(name, heroType, stats) result := &Player{ mapEntity: newMapEntity(x, y),