remove redundant getExperienceForLevel implementation

omarcopires · May 16, 2024 · f09580a · f09580a
1 parent 481e9f9
commit f09580a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/data/scripts/talkactions/god/add_skill.lua b/data/scripts/talkactions/god/add_skill.lua
@@ -16,10 +16,6 @@ local function getSkillId(skillName)
 	end
 end
 
-local function getExpForLevel(level)
-	return math.floor((((level - 6) * level + 17) * level - 12) / 6) * 100
-end
-
 local addSkill = TalkAction("/addskill")
 
 function addSkill.onSay(player, words, param)
@@ -53,7 +49,7 @@ function addSkill.onSay(player, words, param)
 	local ch = split[2]:sub(1, 1)
 	if ch == "l" or ch == "e" then
 		targetLevel = target:getLevel() + count
-		targetExp = getExpForLevel(targetLevel)
+		targetExp = Game.getExperienceForLevel(targetLevel)
 		addExp = targetExp - target:getExperience()
 		target:addExperience(addExp, false)
 	elseif ch == "m" then

diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp
@@ -227,7 +227,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
 	void addList() override;
 	void removePlayer(bool displayEffect, bool forced = true);
 
-	static uint64_t getExpForLevel(uint64_t lv) {
+	static uint64_t getExpForLevel(const uint64_t lv) {
 		return (((lv - 6ULL) * lv + 17ULL) * lv - 12ULL) / 6ULL * 100ULL;
 	}
 

diff --git a/src/lua/functions/core/game/game_functions.cpp b/src/lua/functions/core/game/game_functions.cpp
@@ -191,6 +191,17 @@ int GameFunctions::luaGameloadMapChunk(lua_State* L) {
 	return 0;
 }
 
+int GameFunctions::luaGameGetExperienceForLevel(lua_State* L) {
+	// Game.getExperienceForLevel(level)
+	const uint32_t level = getNumber<uint32_t>(L, 1);
+	if (level == 0) {
+		lua_pushnumber(L, 0);
+	} else {
+		lua_pushnumber(L, Player::getExpForLevel(level));
+	}
+	return 1;
+}
+
 int GameFunctions::luaGameGetMonsterCount(lua_State* L) {
 	// Game.getMonsterCount()
 	lua_pushnumber(L, g_game().getMonstersOnline());

diff --git a/src/lua/functions/core/game/game_functions.hpp b/src/lua/functions/core/game/game_functions.hpp
@@ -28,6 +28,7 @@ class GameFunctions final : LuaScriptInterface {
 		registerMethod(L, "Game", "loadMap", GameFunctions::luaGameLoadMap);
 		registerMethod(L, "Game", "loadMapChunk", GameFunctions::luaGameloadMapChunk);
 
+		registerMethod(L, "Game", "getExperienceForLevel", GameFunctions::luaGameGetExperienceForLevel);
 		registerMethod(L, "Game", "getMonsterCount", GameFunctions::luaGameGetMonsterCount);
 		registerMethod(L, "Game", "getPlayerCount", GameFunctions::luaGameGetPlayerCount);
 		registerMethod(L, "Game", "getNpcCount", GameFunctions::luaGameGetNpcCount);
@@ -103,6 +104,7 @@ class GameFunctions final : LuaScriptInterface {
 	static int luaGameLoadMap(lua_State* L);
 	static int luaGameloadMapChunk(lua_State* L);
 
+	static int luaGameGetExperienceForLevel(lua_State* L);
 	static int luaGameGetMonsterCount(lua_State* L);
 	static int luaGameGetPlayerCount(lua_State* L);
 	static int luaGameGetNpcCount(lua_State* L);