Mining Improvements - REVERSED

[Metin2 Dev 9199]

This is the hidden content, please

• Sign In
• or
• Sign Up

Alternative download links →

This is the hidden content, please

• Sign In
• or
• Sign Up

 

PS: I don't know what versions these fixes were added in 

Fixes:
- First click doesn't fail anymore (when clicking from a distance)
- If the mining fails the change will be broadcasted around (also for you)

Notes:
- InstanceBase.cpp -> FUNC_WAIT: this is diferent in the oficial binary, I just adapted it for mining only
- Server part is just a guess because they added this (kDigMotion.target_vid == 0 && kDigMotion.count == 0) in PythonNetworkStreamPhaseGame.cpp
- The notice function from game.py is also changed (def OnCannotMining) but I can't find the texts in locale_game.txt

Spoiler

def OnCannotMining(self, fail_type):
    if fail_type == playerm2g2.MINING_FAIL_ON_MOUNT:
        chatm2g.AppendChat(chatm2g.CHAT_TYPE_INFO, localeInfo.GAME_CANNOT_MINING)
    elif fail_type == playerm2g2.MINING_FAIL_WITHOUT_PICK:
        chatm2g.AppendChat(chatm2g.CHAT_TYPE_INFO, localeInfo.MINING_FAIL_WITHOUT_PICK)
    elif fail_type == playerm2g2.MINING_FAIL_WHEN_POLY:
        chatm2g.AppendChat(chatm2g.CHAT_TYPE_INFO, localeInfo.MINING_FAIL_WHEN_POLY)
        
void CPythonPlayer::__SendClickActorPacket(CInstanceBase& rkInstVictim)
{
    if (rkInstVictim.IsResource())
    {
        CInstanceBase* pkInstMain = NEW_GetMainActorPtr();
        if (pkInstMain)
        {
            BYTE bFailType = 0;

           if (pkInstMain->IsPoly())
            {
                bFailType = CPythonPlayer::MINING_FAIL_WHEN_POLY;
            }
            else if (!pkInstMain->IsHoldingPickAxe())
            {
                bFailType = CPythonPlayer::MINING_FAIL_WITHOUT_PICK;
            }
            else if (pkInstMain->IsMountingHorse())
            {
                bFailType = CPythonPlayer::MINING_FAIL_ON_MOUNT;
            }

            if (bFailType != 0)
            {
                PyCallClassMemberFunc(m_ppyGameWindow, "OnCannotMining", Py_BuildValue("(i)", bFailType));
                return;
            }
        }
    }

    static DWORD s_dwNextTCPTime = 0;

    DWORD dwCurTime              = ELTimer_GetMSec();

    if (dwCurTime >= s_dwNextTCPTime)
    {
        s_dwNextTCPTime                   = dwCurTime + 1000;

        CPythonNetworkStream& rkNetStream = CPythonNetworkStream::Instance();
        DWORD dwVictimVID                 = rkInstVictim.GetVirtualID();

        rkNetStream.SendOnClickPacket(dwVictimVID);
    }
}

 

 

[xP3NG3Rx 24790]

The fail_type came with v25.1.6. and the custom mining motion type in 2018.

Spoiler

The texts are not in the locale, they forgot to add them, since then it still spams into syserr.

Edited April 29 by Metin2 Dev International
Core X - External 2 Internal