Maxi/InfantrySkillCalculator
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Activity

Adjusted full-calc statistics. Use new infantry skill algorithm.
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 7s
Details

Browse Source
This commit is contained in:
MaxJa4
2024-01-25 18:04:45 +01:00
parent 7338d34765
commit 93908f7da5
4 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
controllers/tracker_controller.go
View File

@@ -25,7 +25,7 @@ func GetScoreByPlayerID(c *gin.Context) {
score, err := models.PlayerCache.GetScore(player.ID)
var statusCode int = http.StatusOK
if err != nil || score == -1 {
score, statusCode = GetPlayerScore(player.Name)
score, statusCode = GetPlayerScoreNew(player.Name)
if score == score && score != -1 { // not NaN
if err := models.PlayerCache.SetScore(player.ID, score); err != nil {
utils.Logger.Errorf("[SCORE] Failed to cache player score: %s", err.Error())
@@ -50,7 +50,7 @@ func GetScoreByPlayerID(c *gin.Context) {
// GetScoreByPlayerName POST /score/:player_name
func GetScoreByPlayerName(c *gin.Context) {
playerName := c.Param("player_name")
score, statusCode := GetPlayerScore(playerName)
score, statusCode := GetPlayerScoreNew(playerName)
switch statusCode {
case 200:
@@ -73,7 +73,15 @@ func GetPlayerScore(playerName string) (float32, int) {
return calcPlayerScore(playerData), statusCode
}
func getPlayerData(playerName string) (*models.TrackerWeaponJSON, int) {
func GetPlayerScoreNew(playerName string) (float32, int) {
playerData, statusCode := getPlayerData(playerName)
if statusCode != 200 {
return -1, statusCode
}
return calcPlayerScoreNew(playerData), statusCode
}
func getPlayerData(playerName string) (*models.TrackerDataJSON, int) {
c := http.Client{}
reqUri := "https://api.gametools.network/bf2042/stats/?raw=false&format_values=false&name=" + playerName + "&platform=pc"
@@ -105,7 +113,7 @@ func getPlayerData(playerName string) (*models.TrackerWeaponJSON, int) {
return nil, res.StatusCode
}
var response models.TrackerWeaponJSON
var response models.TrackerDataJSON
body, err := io.ReadAll(res.Body)
if err != nil {
utils.Logger.Errorf("[SCORE] Failed to read response body: %s", err.Error())
@@ -119,7 +127,26 @@ func getPlayerData(playerName string) (*models.TrackerWeaponJSON, int) {
return &response, 200
}
func calcPlayerScore(playerData *models.TrackerWeaponJSON) float32 {
func calcPlayerScoreNew(playerData *models.TrackerDataJSON) float32 {
const KdFactor = 0.5
const KpmFactor = 0.3
const ObjectiveFactor = 0.15
const SupportFactor = 0.05
const NormalizeFactor = 1.3
cleanedKills := playerData.DivKills.ADS + playerData.DivKills.Hip - playerData.DivKills.AI
kd := float64(cleanedKills) / float64(playerData.Deaths)
kpm := float64(cleanedKills) / float64(playerData.SecondsPlayed/60.0)
objective := float64(playerData.XP[0].Ribbons.Objective) / float64(playerData.XP[0].Ribbons.Total)
support := float64(playerData.XP[0].Ribbons.Support+playerData.XP[0].Ribbons.Squad) / float64(playerData.XP[0].Ribbons.Total)
score := (kd * KdFactor) + (kpm * KpmFactor) + (objective * ObjectiveFactor) + (support * SupportFactor)
score *= NormalizeFactor
return float32(score)
}
func calcPlayerScore(playerData *models.TrackerDataJSON) float32 {
gameMetrics := GetGameMetric("BF2042")
if gameMetrics == nil {
utils.Logger.Errorf("[SCORE] No game metrics specified for '%s'", "BF2042")