Skip to content
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

Added request resource balance #4646

Merged
merged 6 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions data/scripts/network/request_resource_balance.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
local callbacks = {
[RESOURCE_BANK_BALANCE] = Player.getBankBalance,
[RESOURCE_GOLD_EQUIPPED] = Player.getMoney,
}

local handler = PacketHandler(0xED)

function handler.onReceive(player, msg)
local resource = msg:getByte()
local callback = callbacks[resource]
if not callback then
-- print("[Warning] Unknown resource type " .. string.format("%x", resource))
reyaleman marked this conversation as resolved.
Show resolved Hide resolved
return
end

player:sendResourceBalance(resource, callback(player))
end

handler:register()
23 changes: 23 additions & 0 deletions src/luascript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,12 @@ void LuaScriptInterface::registerFunctions()
registerEnum(DECAYING_TRUE);
registerEnum(DECAYING_PENDING);

registerEnum(RESOURCE_BANK_BALANCE);
registerEnum(RESOURCE_GOLD_EQUIPPED);
registerEnum(RESOURCE_PREY_WILDCARDS);
registerEnum(RESOURCE_DAILYREWARD_STREAK);
registerEnum(RESOURCE_DAILYREWARD_JOKERS);

// _G
registerGlobalVariable("INDEX_WHEREEVER", INDEX_WHEREEVER);
registerGlobalBoolean("VIRTUAL_PARENT", true);
Expand Down Expand Up @@ -2779,6 +2785,8 @@ void LuaScriptInterface::registerFunctions()
registerMethod("Player", "setClientLowLevelBonusDisplay",
LuaScriptInterface::luaPlayerSetClientLowLevelBonusDisplay);

registerMethod("Player", "sendResourceBalance", LuaScriptInterface::luaPlayerSendResourceBalance);

// Monster
registerClass("Monster", "Creature", LuaScriptInterface::luaMonsterCreate);
registerMetaMethod("Monster", "__eq", LuaScriptInterface::luaUserdataCompare);
Expand Down Expand Up @@ -11085,6 +11093,21 @@ int LuaScriptInterface::luaPlayerSetClientLowLevelBonusDisplay(lua_State* L)
return 1;
}

int LuaScriptInterface::luaPlayerSendResourceBalance(lua_State* L)
{
// player:sendResourceBalance(resource, amount)
Player* player = getUserdata<Player>(L, 1);
if (player) {
const ResourceTypes_t resourceType = getNumber<ResourceTypes_t>(L, 2);
uint64_t amount = getNumber<uint64_t>(L, 3);
player->sendResourceBalance(resourceType, amount);
pushBoolean(L, true);
} else {
lua_pushnil(L);
}
return 1;
}

// Monster
int LuaScriptInterface::luaMonsterCreate(lua_State* L)
{
Expand Down
2 changes: 2 additions & 0 deletions src/luascript.h
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,8 @@ class LuaScriptInterface
static int luaPlayerGetClientLowLevelBonusDisplay(lua_State* L);
static int luaPlayerSetClientLowLevelBonusDisplay(lua_State* L);

static int luaPlayerSendResourceBalance(lua_State* L);

// Monster
static int luaMonsterCreate(lua_State* L);

Expand Down
6 changes: 6 additions & 0 deletions src/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,12 @@ class Player final : public Creature, public Cylinder
client->sendCombatAnalyzer(type, amount, impactType, target);
}
}
void sendResourceBalance(const ResourceTypes_t resourceType, uint64_t amount)
{
if (client) {
client->sendResourceBalance(resourceType, amount);
}
}

void receivePing() { lastPong = OTSYS_TIME(); }

Expand Down
Loading