- gr2: BitKnit2 decompression, 64-bit LE files, compressed curves - net: remaining GamePhase handlers, generated GC packet table - python: event/chat/chr/minimap/guild/quest/messenger/shop-search and other native modules ported against the AVA2 Windows client - render: D3D8 fixed-function lighting in Gr2ModelRenderer, terrain without baked shade; cape/NPC equipment attachment - tests + audits updated; docs/PORT-PLAN.md and WINDOWS-PARITY.md Batch 4 (render pipeline: background.*, app.RenderGame/UpdateGame, camera bindings, main.cpp fake-content removal) is still in progress. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
136 lines
9.1 KiB
C++
136 lines
9.1 KiB
C++
// CPythonSystem / systemSetting against the original AVA2 PythonSystem.cpp + PythonSystemModule.cpp:
|
|
// metin2.cfg parsing and the exact SaveConfig text, interface.cfg as raw little-endian int32,
|
|
// display-mode merging, SetConfig/GetConfig and the module surface.
|
|
#include "python_system.h"
|
|
#include "python_runtime.h"
|
|
#include "eter_sound/SoundManager.h"
|
|
#include <cmath>
|
|
#include <cstring>
|
|
#include <filesystem>
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <sstream>
|
|
#include <stdexcept>
|
|
#include <vector>
|
|
using namespace ava2;
|
|
namespace fs = std::filesystem;
|
|
void require(bool ok,const char* why) { if(!ok)throw std::runtime_error(why); }
|
|
std::string slurp(const fs::path& p) { std::ifstream f(p,std::ios::binary);std::stringstream s;s<<f.rdbuf();return s.str(); }
|
|
void spit(const fs::path& p,const std::string& s) { std::ofstream f(p,std::ios::binary);f<<s; }
|
|
int main(int argc,char** argv) {
|
|
if(argc!=3)return 2;
|
|
try {
|
|
const fs::path dir=fs::temp_directory_path()/"ava2_system_setting_test";
|
|
fs::remove_all(dir);fs::create_directories(dir);
|
|
CPythonSystem::SetConfigDirectory(dir.string());
|
|
auto& sys=CPythonSystem::Instance();
|
|
|
|
// No files: SetDefaultConfig, isInterfaceConfig false.
|
|
sys.Reload();
|
|
require(sys.GetWidth()==1024 && sys.GetHeight()==768 && sys.GetBPP()==32,"default resolution");
|
|
require(!sys.isInterfaceConfig() && sys.GetShadowLevel()==3 && sys.GetSoundVolume()==5,"defaults");
|
|
require(sys.GetFOVLevel()==30.0f && sys.GetObjectDistance()==25600.0f && !sys.IsShowOutline(),"defaults 2");
|
|
|
|
// metin2.cfg: case-insensitive keys, old integer MUSIC_VOLUME, SAVE_ID, a value-less line that
|
|
// keeps the previous value buffer (sscanf leaves it), OBJECT_DIST capped, and a blank line
|
|
// (sscanf EOF) that ends the parse.
|
|
spit(dir/"metin2.cfg",
|
|
"width 1280\nHEIGHT\t720\nMUSIC_VOLUME 3\nVOICE_VOLUME 4\nSHADOW_LEVEL 2\nIS_SAVE_ID 1\nSAVE_ID hero\n"
|
|
"SHOW_OUTLINE 1\nSHOW_SHADOW\nVIEW_CHAT 2\nperspective 45.5\nshop_range 3\nOBJECT_DIST 99999\nPRE_LOADING_DELAY_TIME 7\n"
|
|
"\nWIDTH 640\n");
|
|
unsigned char raw[200]={};
|
|
auto put=[&](int idx,int field,int32_t v){ for(int i=0;i<4;++i) raw[(idx*5+field)*4+i]=uint8_t(uint32_t(v)>>(i*8)); };
|
|
put(CPythonSystem::WINDOW_CHAT,0,1);put(CPythonSystem::WINDOW_CHAT,2,-20);put(CPythonSystem::WINDOW_CHAT,4,300);
|
|
spit(dir/"interface.cfg",std::string(reinterpret_cast<char*>(raw),sizeof(raw)));
|
|
sys.Reload();
|
|
require(sys.GetWidth()==1280 && sys.GetHeight()==720,"cfg resolution");
|
|
require(std::fabs(sys.GetMusicVolume()-std::pow(10.0f,-0.4f))<1e-6f,"old music volume");
|
|
require(sys.GetSoundVolume()==4 && sys.GetShadowLevel()==2 && sys.IsSaveID()==1,"cfg ints");
|
|
require(std::string(sys.GetSaveID())=="hero","save id");
|
|
require(sys.IsShowOutline() && !sys.IsViewChat(),"flags are ==1");
|
|
require(sys.GetFOVLevel()==45.5f && sys.GetShopNamesRange()==3 && sys.GetObjectDistance()==25600.0f,"floats");
|
|
require(g_iLoadingDelayTime==7,"loading delay");
|
|
require(sys.IsShadow(),"value-less SHOW_SHADOW reuses the previous '1'");
|
|
require(sys.isInterfaceConfig() && sys.GetWindowStatusReference(CPythonSystem::WINDOW_CHAT).ixPosition==-20,"interface.cfg");
|
|
require(SoundManager::Instance().GetMusicVolume()==sys.GetMusicVolume(),"ChangeSystem music volume");
|
|
|
|
// Display list: <800x600 and 24 bpp dropped, refresh rates merged per resolution.
|
|
sys.ClearDisplaySettings();
|
|
sys.AddDisplayMode(640,480,32,60);sys.AddDisplayMode(1024,768,24,60);
|
|
sys.AddDisplayMode(1024,768,32,60);sys.AddDisplayMode(1280,720,32,60);sys.AddDisplayMode(1280,720,32,75);
|
|
sys.AddDisplayMode(1280,720,32,60);
|
|
require(sys.GetResolutionCount()==2 && sys.GetFrequencyCount(1)==2 && sys.GetFrequencyCount(5)==0,"display list");
|
|
require(sys.GetResolutionIndex(1280,720,32)==1 && sys.GetResolutionIndex(1,1,32)==0 && sys.GetFrequencyIndex(1,75)==1,"indexes");
|
|
|
|
PythonRuntime python(argv[1],argv[2]);
|
|
python.execute(
|
|
"import systemSetting as s\n"
|
|
"assert (s.WINDOW_STATUS,s.WINDOW_MINIMAP,s.WINDOW_CHAT)==(0,8,9)\n"
|
|
"for n in ('SetCollectEquipment','IsCollectEquipment','SetFastPickup','IsEnabledFastPickup'):\n assert not hasattr(s,n),n\n"
|
|
"assert (s.GetWidth(),s.GetHeight())==(1280,720)\n"
|
|
"assert s.GetCurrentResolution()==(1280,720,32)\n"
|
|
"assert s.GetResolutionCount()==2 and s.GetResolution(1)==(1280,720,32) and s.GetResolution(9)==(0,0,0)\n"
|
|
"assert s.GetFrequency(1,1)==75 and s.GetFrequency(1,2)==0\n"
|
|
"assert s.GetWindowStatus(s.WINDOW_CHAT)==(1,0,-20,0,300)\n"
|
|
"s.SaveWindowStatus(s.WINDOW_QUICK,1,1,5,6,7)\nassert s.GetWindowStatus(s.WINDOW_QUICK)==(1,1,5,6,7)\n"
|
|
"assert s.isSaveID()==1 and s.GetSaveID()=='hero'\n"
|
|
"s.SetSaveID(0,'other')\nassert s.GetSaveID()=='hero'\n"
|
|
"s.SetSaveID(1,'abcdefghijklmnopqrstuvwxyz')\nassert s.GetSaveID()=='abcdefghijklmnopqrs'\n"
|
|
"s.SetSoundVolumef(0.5)\nassert s.GetSoundVolume()==2\n"
|
|
"s.SetMusicVolume(0.25)\nassert abs(s.GetMusicVolume()-0.25)<1e-6\n"
|
|
"s.SetShadowLevel(0)\nassert s.GetShadowLevel()==2\n"
|
|
"s.SetShadowLevel(9)\nassert s.GetShadowLevel()==5\n"
|
|
"s.SetViewChatFlag(2)\nassert s.IsViewChat()==0\ns.SetViewChatFlag(1)\nassert s.IsViewChat()==1\n"
|
|
"s.SetShowOutlineFlag(0)\nassert s.IsShowOutline()==0\n"
|
|
"s.SetShadow(1)\nassert s.IsShadow()==1\n"
|
|
"s.SetFOVLevel(120.0)\nassert s.GetFOVLevel()==100.0\ns.SetFOVLevel(10)\nassert s.GetFOVLevel()==30.0\n"
|
|
"s.SetMapObjectDistance(30000.0)\nassert s.GetMapObjectDistance()==25600.0\n"
|
|
"s.SetShopNamesRange(258)\nassert s.GetShopNamesRange()==2\n"
|
|
"s.SetQuestIconMode(5)\nassert s.GetQuestIconMode()==1\n"
|
|
"s.SetPetRender(0)\nassert s.GetPetRender()==0\n"
|
|
"s.SetDungeonTrack(1)\nassert s.GetDungeonTrack()==1\n"
|
|
"s.SetShowMobLevel(0)\nassert s.IsShowMobLevel()==0\n"
|
|
"assert s.SetViewChatFlag('x') is None\n"
|
|
// SetConfig keeps the old config on a bad resolution/frequency index.
|
|
"s.SetConfig(7,0,1,3,0,1,2,1,4)\nassert s.GetCurrentResolution()==(1280,720,32)\n"
|
|
"s.SetConfig(0,0,1,3,0,1,2,1,4)\nassert s.GetCurrentResolution()==(1024,768,32)\n"
|
|
"assert s.IsSoftwareCursor()==1 and s.GetSoundVolume()==2\n"
|
|
"assert abs(s.GetMusicVolume()-1.0)<1e-6\n"
|
|
// 32-bit varargs quirk: the double music volume fills two int slots (1.0 = 0x3FF00000:0).
|
|
"assert s.GetConfig()==(0,0,1,0,0,0x3FF00000,2,1),s.GetConfig()\n"
|
|
"class H:\n def __init__(self):\n self.n=0\n def OnSaveInterfaceStatus(self):\n self.n+=1\n s.SaveWindowStatus(s.WINDOW_STATUS,1,0,11,12,13)\n"
|
|
"h=H()\ns.SetInterfaceHandler(h)\n");
|
|
sys.ApplyConfig();
|
|
require(sys.GetAppliedGamma()==0.7f,"gamma 1 -> 0.7");
|
|
sys.SaveInterfaceStatus();
|
|
python.execute("assert h.n==1\ns.DestroyInterfaceHandler()\n");
|
|
const std::string iface=slurp(dir/"interface.cfg");
|
|
require(iface.size()==200 && iface[0]==1 && iface[8]==11 && iface[16]==13,"interface.cfg layout");
|
|
require(uint8_t(iface[(9*5+2)*4])==0xEC && uint8_t(iface[(9*5+2)*4+3])==0xFF,"negative int32 LE");
|
|
sys.SaveInterfaceStatus();
|
|
python.execute("assert h.n==1\n");
|
|
|
|
python.execute("assert s.SaveConfig()==1\n");
|
|
const std::string expected=
|
|
"WIDTH\t\t\t\t\t\t1024\nHEIGHT\t\t\t\t\t\t768\nBPP\t\t\t\t\t\t32\nFREQUENCY\t\t\t\t\t60\n"
|
|
"SOFTWARE_CURSOR\t\t\t1\nOBJECT_CULLING\t\t\t\t0\nVISIBILITY\t\t\t\t\t4\nMUSIC_VOLUME\t\t\t\t1.000\n"
|
|
"VOICE_VOLUME\t\t\t\t2\nGAMMA\t\t\t\t\t\t1\nIS_SAVE_ID\t\t\t\t\t1\nSAVE_ID\t\t\t\t\tabcdefghijklmnopqrs\n"
|
|
"PRE_LOADING_DELAY_TIME\t\t7\nDECOMPRESSED_TEXTURE\t\t0\n"
|
|
"SHOW_MOBLEVEL\t\t0\n"
|
|
"SHOW_OUTLINE\t\t\t\t0\nUSE_DEFAULT_IME\t\t0\nSOFTWARE_TILING\t\t0\nSHADOW_LEVEL\t\t\t5\n"
|
|
"SNOW_TEXTURE_MODE\t\t\t0\nSHOW_SHADOW\t\t\t\t1\nshop_range\t2\n"
|
|
"QUEST_LETTER\t\t\t\t1\nCOUNTRY_FLAG\t\t\t\t1\nAFFECT_ICONS\t\t\t\t1\nperspective\t30.0\n"
|
|
"effect_level\t0\npet_status\t0\nmount_status\t1\nnpc_status\t1\nnight_mode\t0\nspecial_message\t1\n"
|
|
"DUNGEON_TRACK\t1\nBOSS_TRACK\t0\nOBJECT_DIST\t25600.00000\n\n";
|
|
const std::string saved=slurp(dir/"metin2.cfg");
|
|
if(saved!=expected) { std::cerr<<saved; throw std::runtime_error("SaveConfig text"); }
|
|
// Round trip: what SaveConfig wrote loads back to the same state.
|
|
sys.Reload();
|
|
require(sys.GetWidth()==1024 && sys.IsSoftwareCursor() && sys.GetShadowLevel()==5 && sys.IsShadow(),"round trip");
|
|
require(!sys.IsShowMobLevel() && sys.GetDungeonTrack() && !sys.GetPetRender(),"round trip flags");
|
|
|
|
fs::remove_all(dir);
|
|
std::cout<<"AVA2 systemSetting parity passed\n";
|
|
} catch(const std::exception& e) { std::cerr<<e.what()<<'\n';return 1; }
|
|
}
|