Skip to content

Moradon Warp fix #206

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.

Sign up for GitHub

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Moradon Warp fix #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
314548e
Allow Zonechange to Moradon when there is no battle
UTengine Jul 18, 2023
e561e3c
Moradon MsgSend_Warp fix
UTengine Jul 26, 2023
f7b210b
_WARP_INFO struct size fix
UTengine Jul 26, 2023
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
2 changes: 1 addition & 1 deletion src/game/GameProcMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4173,7 +4173,7 @@ bool CGameProcMain::MsgSend_NPCEvent(short siIDTarget) {
int iOffset = 0;

CAPISocket::MP_AddByte(byBuff, iOffset, N3_WARP_LIST);
CAPISocket::MP_AddByte(byBuff, iOffset, WI.iID); // ���� ���̵� ������...
CAPISocket::MP_AddShort(byBuff, iOffset, WI.iID); // ���� ���̵� ������...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why which from byte to short here?

Copy link
Contributor Author

@UTengine UTengine Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you can see below:
https://github.com/srmeier/KnightOnline/blob/80268e2fa971389a3e94c430966a7943c2631dbf/Client/WarFare/GameProcMain.cpp#L4205C15-L4205C24
https://cdn.discordapp.com/attachments/1004036880444162089/1130637969892585532/Desktop_2023.07.18_-_01.10.12.07.mp4

s_pSocket->Send(byBuff, iOffset);
}

Expand Down
1 change: 1 addition & 0 deletions src/server/Ebenezer/GameDefine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ struct _WARP_INFO {
float fY;
float fZ;
float fR;
short sNation;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add this if it isn't being used anywhere?

Copy link
Contributor Author

@UTengine UTengine Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because without it loading any map will give screwed up warps.
Unless you want to stick with the oldest available maps elmorad and karus zone, they do work out of the box.
But before Moradon and KE was introduced this was added, it's a matter of preference I can either go with map.cpp load warplist readfile and do a skip size of short. Or we can just adjust the size of warp struct to fit newer SMD's.
See screenshot I included in the opening post. I remember twostars saying that the SMD's were horribly wrong/damaged/corrupted. Not even hinting out or sharing what was actually wrong.
Nobody ever took this much time as I dissected SMD's with hex editor.
I will publish the smd files along with this code once I'm done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to diagnose your own files, you can use my provided sample code this goes straight into map.cpp ebenezer:
Now you can export all warps to a text file, adjust struct of warpinfo with a snation and try without it, if you got mixed smd files you will see mixed results some zones proper warps and some with invalid numbers because of the missing short.

void C3DMap::LoadWarpList(HANDLE hFile) {
int WarpCount = 0;
DWORD dwNum;
_WARP_INFO * pWarp = NULL;

ReadFile(hFile, &WarpCount, 4, &dwNum, NULL);

for (int i = 0; i < WarpCount; i++) {
    pWarp = new _WARP_INFO;

    ReadFile(hFile, pWarp, sizeof(_WARP_INFO), &dwNum, NULL);

    if (!m_WarpArray.PutData(pWarp->sWarpID, pWarp)) {
        TRACE("Warp list PutData Fail - %d\n", pWarp->sWarpID);
        delete pWarp;
        pWarp = NULL;
    }
    UpdateWarpInfo(pWarp);
}

}

struct Warp {
short sWarpID;
char strWarpName[32];
char strAnnounce[256];
DWORD dwPay;
short sZone;
float fX;
float fY;
float fZ;
float fR;
short sNation;
};

void C3DMap::UpdateWarpInfo(_WARP_INFO * pWarp) {
if (!pWarp) {
return;
}
CStdioFile file;
CString line;
CArray lines;

if (file.Open(_T("warpinfo.txt"), CFile::modeReadWrite | CFile::typeText)) {
    while (file.ReadString(line)) {
        line.TrimRight(); // Remove trailing whitespace
        if (line.IsEmpty()) {
            continue; // Skip empty lines
        }

        Warp    warp;
        CString remaining;
        if (sscanf_s(line, "%hd\t%31[^\t]\t%255[^\t]\t%d\t%hd\t%f\t%f\t%f\t%f\t%d", &warp.sWarpID, warp.strWarpName,
                     32, warp.strAnnounce, 256, &warp.dwPay, &warp.sZone, &warp.fX, &warp.fY, &warp.fZ, &warp.fR,
                     &warp.sNation) == 10) {
            if (warp.sWarpID == pWarp->sWarpID) {
                // Load the data from the file
                strncpy_s(pWarp->strWarpName, warp.strWarpName, sizeof(pWarp->strWarpName));
                strncpy_s(pWarp->strAnnounce, warp.strAnnounce, sizeof(pWarp->strAnnounce));
                pWarp->dwPay = warp.dwPay;
                pWarp->sZone = warp.sZone;
                pWarp->fX = warp.fX;
                pWarp->fY = warp.fY;
                pWarp->fZ = warp.fZ;
                pWarp->fR = warp.fR;
                pWarp->sNation = warp.sNation;

                file.Close();
                return; // Found matching "warpid" in the file, loaded the data
            }
        }
        lines.Add(line); // Store the current line for rewriting
    }

    // Matching "warpid" not found, insert a new line with the provided pWarp data
    CString newLine;
    newLine.Format(_T("%hd\t%s\t%s\t%d\t%hd\t%f\t%f\t%f\t%f\t%d"), pWarp->sWarpID, pWarp->strWarpName,
                   pWarp->strAnnounce, pWarp->dwPay, pWarp->sZone, pWarp->fX, pWarp->fY, pWarp->fZ, pWarp->fR,
                   pWarp->sNation);
    lines.Add(newLine);

    // Rewrite the file with the updated lines
    file.SeekToBegin();
    file.SetLength(0); // Clear the file
    for (int i = 0; i < lines.GetSize(); i++) {
        file.WriteString(lines[i]);
        file.WriteString(_T("\n")); // Add a new line character
    }

    file.Close();
} else {
    // File does not exist, create it and insert the pWarp data
    if (file.Open(_T("warpinfo.txt"), CFile::modeCreate | CFile::modeWrite | CFile::typeText)) {
        CString newLine;
        newLine.Format(_T("%hd\t%s\t%s\t%d\t%hd\t%f\t%f\t%f\t%f\t%d"), pWarp->sWarpID, pWarp->strWarpName,
                       pWarp->strAnnounce, pWarp->dwPay, pWarp->sZone, pWarp->fX, pWarp->fY, pWarp->fZ, pWarp->fR,
                       pWarp->sNation);
        file.WriteString(newLine);
        file.WriteString(_T("\n")); // Add a new line character

        file.Close();
    } else {
        AfxMessageBox(_T("Failed to create warpinfo.txt file."));
    }
}

}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to add some context and another perspective, some gate objects are nation 0 which means for both, but that doesn't mean you will get Karus and Elmorad warp entries from the same object, that differs if you are invading Karus you are not allowed to teleport to Karus entries but you are allowed to use the object to warp back. (hypothesis) I'm not even going to confirm my suspicion or hypothesis, sooner or later this will have to be done and for now it saves me a lot of work. And if we go to KE SMD's they will have the extra short anyway >.>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I imagine this would prevent our current maps from working, right? Could we update our old maps first by adding a short in the right place? This way we can still load our updated older maps.

Copy link
Contributor Author

@UTengine UTengine Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am already in the process doing that I just need green light and approval then I will upload them and hopefully merge.
<3

Copy link
Contributor Author

@UTengine UTengine Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I imagine this would prevent our current maps from working, right? Could we update our old maps first by adding a short in the right place? This way we can still load our updated older maps.
image

Tested and they work fine so far.
We will need to add event zones for eslant tiles dbo.event is empty.
Also we need to adjust client zones.tbl and zones directory, the 1097 Colony Zone is just way too outdated......
Let's do the rest in different commits okay? (Loading 1264 maps (int version, int stringlength, readsizeofchar + add null termination to terrain loading and opd loading).
I don't want to clutter this Draft too much..

DB table zone_info:

12elmorad_1212.smd              163700418003850010
11karus_1212.smd                371201573003850010
1101battle_0810.smd               23700140003850030
1102battle_0810.smd               23700140003850030
1201freezone_1217.smd             10001000020
121moradon_1021.smd              3120040200010
111k_eslant.smd                  15000150001500000
112e_eslant.smd                  15000150001500000
130siege_1110.smd                10001000020
132abyssb_0925.smd               10001000020

servermaps.zip
servermapsv2.zip (Added Moradon to Piana warplist and adjusted Moradon to Piana warp around the object instead of the castle wall)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with @srmeier here.


_WARP_INFO() {
sWarpID = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/server/Ebenezer/User.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2315,7 +2315,7 @@ void CUser::ZoneChange(int zone, float x, float z) {
}
} else { // Battle zone close
if (pMap->m_bType == 1 && m_pUserData->m_bNation != zone &&
(zone < 10 || zone > 20)) { // ���� ������ ���Ѿ� ����..
(zone < 10 || zone > 21)) { // ���� ������ ���Ѿ� ����..
return;
}
}
Expand Down