validation of skill fix, money boost

gdg-garage · Oct 12, 2023 · bccd81b · bccd81b
1 parent a908724
commit bccd81b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/dungeonsandtrolls/game.go b/server/dungeonsandtrolls/game.go
@@ -782,7 +782,7 @@ func (g *Game) GetPlayerByKey(apiKey string) (*gameobject.Player, error) {
 }
 
 func (g *Game) GetMoney() int32 {
-	return int32(math.Pow(float64(g.Score)*0.001, 0.75) + float64(420))
+	return int32(math.Pow(float64(g.Score)*0.004, 0.75) + float64(420))
 }
 
 func (g *Game) SpawnPlayer(p *gameobject.Player, level int32) {

diff --git a/server/dungeonsandtrolls/handlers/skill.go b/server/dungeonsandtrolls/handlers/skill.go
@@ -41,6 +41,9 @@ func validateSkill(game *dungeonsandtrolls.Game, skillUse *api.SkillUse, p gameo
 	if (skillUse.TargetId != nil || skillUse.Position != nil) && (s.Target == api.Skill_none) {
 		return fmt.Errorf("skill target should be none")
 	}
+	if skillUse.Position == nil && s.Target == api.Skill_position {
+		return fmt.Errorf("skill location not specified")
+	}
 
 	if s.Flags != nil {
 		if s.Flags.Passive {
@@ -122,9 +125,6 @@ func validateSkill(game *dungeonsandtrolls.Game, skillUse *api.SkillUse, p gameo
 		}
 	}
 	if skillUse.Position != nil {
-		if skillUse.Position == nil && s.Target == api.Skill_position {
-			return fmt.Errorf("skill location not specified")
-		}
 		l, err := game.GetCachedLevel(p.GetPosition().Level)
 		if err != nil {
 			return fmt.Errorf("level not found")