Moradon Warp fix

[UTengine]

Description

This is a draft pull request to review before PR/merging.
This fixes warpgates and warpentries and needs to be dealt with asap so I can publish loading of newer FX and zones.
I need every commit to be classed pristine reviewed and good to go, please give me a green light to continue.
I can make the client load tbl entries for warp and we can modify the server to only exchange object ID and warp entries without strings in a later stage, but for now I want this to be accessable to everyone to accelerate and have it simplified.

💔Thank you!

[srmeier]

Added a few questions to better understand what you are trying to achieve

[srmeier]

Why which from byte to short here?

[UTengine]

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

[srmeier]

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

[UTengine]

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.

[UTengine]

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."));
    }
}

}

[UTengine]

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 >.>

[srmeier]

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.

[UTengine]

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

[UTengine]

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.

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:

1	2	elmorad_1212.smd	163700	41800	38500	1	0
1	1	karus_1212.smd	37120	157300	38500	1	0
1	101	battle_0810.smd	23700	14000	38500	3	0
1	102	battle_0810.smd	23700	14000	38500	3	0
1	201	freezone_1217.smd	1000	1000	0	2	0
1	21	moradon_1021.smd	31200	40200	0	1	0
1	11	k_eslant.smd	15000	15000	15000	0	0
1	12	e_eslant.smd	15000	15000	15000	0	0
1	30	siege_1110.smd	1000	1000	0	2	0
1	32	abyssb_0925.smd	1000	1000	0	2	0

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

[stevewgr]

Agree with @srmeier here.