AVA2 client Windows parity passes (gr2 BitKnit2/64-bit, GamePhase handlers, python modules)

- 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>
This commit is contained in:
shenlei
2026-10-08 10:43:01 +09:00
co-authored by Claude Opus 5.5
parent 9f748eb05a
commit 9077aa389a
145 changed files with 22692 additions and 6584 deletions
+449 -72
View File
@@ -1,13 +1,19 @@
#include "python_net.h"
#include "guild_state.h"
#include "python_gameplay_modules.h"
#include "login_client.h"
#include "protocol.h"
#include "eter_net/PythonNetworkStream.h"
#include "eter_net/NetworkActorManager.h"
#include "shared/common/PythonUtils.h"
#include "python_runtime.h"
#include <Python.h>
#include <array>
#include <iostream>
#include <chrono>
#include <stdexcept>
#include <algorithm>
#include <cstring>
namespace ava2 {
namespace {
@@ -31,19 +37,10 @@ void replace(PyObject*& old,PyObject* next) {
Py_XDECREF(previous);
}
// PyCallClassMemberFunc (ScriptLib): a missing method is skipped, a Python
// exception is printed; neither aborts the network pump.
void callback(PyObject* target,const char* name,const char* text=nullptr) {
if(!target) return;
Py_INCREF(target);
auto* method=PyObject_GetAttrString(target,name);
if(!method) {
Py_DECREF(target);
throw std::runtime_error(std::string("missing Python callback: ")+name);
}
auto* result=text?PyObject_CallFunction(method,const_cast<char*>("s"),text):PyObject_CallObject(method,nullptr);
Py_DECREF(method);
Py_DECREF(target);
if(!result) throw std::runtime_error(std::string("Python callback failed: ")+name);
Py_DECREF(result);
PyCallClassMemberFunc(target,name,text?Py_BuildValue("(s)",text):Py_BuildValue("()"));
}
PyObject* set_handler(PyObject*,PyObject* args) { PyObject* value;if(!PyArg_ParseTuple(args,"O",&value)) return nullptr;replace(handler,value);PythonNetworkStream::Instance().SetHandler(value);Py_RETURN_NONE; }
@@ -114,6 +111,352 @@ PyObject* net_dummy_one(PyObject*, PyObject*) { return PyInt_FromLong(1); }
PyObject* net_dummy_str(PyObject*, PyObject*) { return PyString_FromString(""); }
PyObject* net_dummy_tuple4(PyObject*, PyObject*) { return Py_BuildValue("iiii", 0, 0, 0, 0); }
// ── AVA2 PythonNetworkStreamModule.cpp wrappers (ScriptLib argument helpers, Py_BuildException -> None) ──
PyObject* netSendExchangeStartPacket(PyObject*, PyObject* poArgs) {
int vid;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendExchangeStartPacket(vid);
return Py_BuildNone();
}
PyObject* netSendExchangeElkAddPacket(PyObject*, PyObject* poArgs) {
long long elk;
if (!PyTuple_GetLongLong(poArgs, 0, &elk)) return Py_BuildException();
PythonNetworkStream::Instance().SendExchangeElkAddPacket(elk);
return Py_BuildNone();
}
PyObject* netSendExchangeItemAddPacket(PyObject*, PyObject* poArgs) {
unsigned char window; unsigned short slot; int displayPos;
if (!PyTuple_GetInteger(poArgs, 0, &window)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &slot)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &displayPos)) return Py_BuildException();
PythonNetworkStream::Instance().SendExchangeItemAddPacket(window, slot, static_cast<uint8_t>(displayPos));
return Py_BuildNone();
}
PyObject* netSendExchangeItemDelPacket(PyObject*, PyObject* poArgs) {
int pos;
if (!PyTuple_GetInteger(poArgs, 0, &pos)) return Py_BuildException();
PythonNetworkStream::Instance().SendExchangeItemDelPacket(static_cast<uint8_t>(pos));
return Py_BuildNone();
}
PyObject* netSendExchangeAcceptPacket(PyObject*, PyObject*) { PythonNetworkStream::Instance().SendExchangeAcceptPacket();return Py_BuildNone(); }
PyObject* netSendExchangeExitPacket(PyObject*, PyObject*) { PythonNetworkStream::Instance().SendExchangeExitPacket();return Py_BuildNone(); }
PyObject* netSendPrivateShopSearchInfo(PyObject*,PyObject* args) {
TPacketCGShopSearch p{};
if(!PyTuple_GetInteger(args,0,&p.ItemCat)||!PyTuple_GetInteger(args,1,&p.SubCat))return Py_BuildException();
uint8_t* pairs[]={p.avg,p.skill,p.abs,p.level,p.refine};
for(int i=0;i<10;++i)if(!PyTuple_GetInteger(args,i+2,&pairs[i/2][i%2]))return Py_BuildException();
if(!PyTuple_GetInteger(args,12,&p.enchant)||!PyTuple_GetInteger(args,13,&p.alchemy)||
!PyTuple_GetInteger(args,14,&p.sex)||!PyTuple_GetInteger(args,15,&p.character))return Py_BuildException();
long long lo,hi;char* input;
if(!PyTuple_GetLongLong(args,16,&lo)||!PyTuple_GetLongLong(args,17,&hi)||!PyTuple_GetString(args,18,&input))return Py_BuildException();
if(PyErr_Occurred())return nullptr;
const size_t length=std::strlen(input);
if(length>=sizeof(p.searchInput)) { PyErr_SetString(PyExc_ValueError,"Shop search text exceeds 49 bytes");return nullptr; }
std::memcpy(p.searchInput,input,length);p.price[0]=lo;p.price[1]=hi;
PythonNetworkStream::Instance().SendPrivateShopSearchInfo(p);Py_RETURN_NONE;
}
PyObject* netSendMessengerAddByVIDPacket(PyObject*, PyObject* poArgs) {
int vid;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendMessengerAddByVIDPacket(vid);
return Py_BuildNone();
}
PyObject* netSendMessengerAddByNamePacket(PyObject*, PyObject* poArgs) {
char* name;
if (!PyTuple_GetString(poArgs, 0, &name)) return Py_BuildException();
PythonNetworkStream::Instance().SendMessengerAddByNamePacket(name);
return Py_BuildNone();
}
PyObject* netSendMessengerRemovePacket(PyObject*, PyObject* poArgs) {
char* key; char* name;
if (!PyTuple_GetString(poArgs, 0, &key)) return Py_BuildException();
if (!PyTuple_GetString(poArgs, 1, &name)) return Py_BuildException();
PythonNetworkStream::Instance().SendMessengerRemovePacket(key, name);
return Py_BuildNone();
}
// IAbstractPlayer::PartyMemberVIDToPID. The port does not track party members yet
// (player.IsPartyMember is still a placeholder), so the lookup fails like an empty party.
bool party_member_vid_to_pid(uint32_t, uint32_t*) { return false; }
PyObject* netSendPartyInvitePacket(PyObject*, PyObject* poArgs) {
int vid;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartyInvitePacket(vid);
return Py_BuildNone();
}
PyObject* netSendPartyInviteAnswerPacket(PyObject*, PyObject* poArgs) {
int vid, answer;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &answer)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartyInviteAnswerPacket(vid, static_cast<uint8_t>(answer));
return Py_BuildNone();
}
PyObject* netSendPartyExitPacket(PyObject*, PyObject*) {
uint32_t pid;
if (party_member_vid_to_pid(PythonNetworkStream::Instance().GetMainActorVID(), &pid))
PythonNetworkStream::Instance().SendPartyRemovePacket(pid);
return Py_BuildNone();
}
PyObject* netSendPartyRemovePacketPID(PyObject*, PyObject* poArgs) {
int pid;
if (!PyTuple_GetInteger(poArgs, 0, &pid)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartyRemovePacket(pid);
return Py_BuildNone();
}
PyObject* netSendPartyRemovePacketVID(PyObject*, PyObject* poArgs) {
int vid;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
uint32_t pid;
if (party_member_vid_to_pid(vid, &pid)) PythonNetworkStream::Instance().SendPartyRemovePacket(pid);
return Py_BuildNone();
}
PyObject* netSendPartySetStatePacket(PyObject*, PyObject* poArgs) {
int vid, state, flag;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &state)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &flag)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartySetStatePacket(vid, static_cast<uint8_t>(state), static_cast<uint8_t>(flag));
return Py_BuildNone();
}
PyObject* netSendPartyUseSkillPacket(PyObject*, PyObject* poArgs) {
int skillIndex, vid;
if (!PyTuple_GetInteger(poArgs, 0, &skillIndex)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartyUseSkillPacket(static_cast<uint8_t>(skillIndex), vid);
return Py_BuildNone();
}
PyObject* netSendPartyParameterPacket(PyObject*, PyObject* poArgs) {
int mode;
if (!PyTuple_GetInteger(poArgs, 0, &mode)) return Py_BuildException();
PythonNetworkStream::Instance().SendPartyParameterPacket(static_cast<uint8_t>(mode));
return Py_BuildNone();
}
PyObject* netSendSafeboxSaveMoneyPacket(PyObject*, PyObject* poArgs) {
int money;
if (!PyTuple_GetInteger(poArgs, 0, &money)) return Py_BuildException();
PythonNetworkStream::Instance().SendSafeBoxMoneyPacket(0, money); // SAFEBOX_MONEY_STATE_SAVE: disabled, sends nothing
return Py_BuildNone();
}
PyObject* netSendSafeboxWithdrawMoneyPacket(PyObject*, PyObject* poArgs) {
int money;
if (!PyTuple_GetInteger(poArgs, 0, &money)) return Py_BuildException();
PythonNetworkStream::Instance().SendSafeBoxMoneyPacket(1, money); // SAFEBOX_MONEY_STATE_WITHDRAW: disabled, sends nothing
return Py_BuildNone();
}
// TItemPos() starts as {INVENTORY, WORD_MAX}; Windows' switch has no default for other arg counts,
// sending the ctor position and an uninitialized safebox slot (emitted as 0 here).
PyObject* netSendSafeboxCheckinPacket(PyObject*, PyObject* poArgs) {
unsigned char window = 1; unsigned short cell = 0xffff; int safeboxPos = 0;
switch (PyTuple_Size(poArgs)) {
case 2:
window = 1;
if (!PyTuple_GetInteger(poArgs, 0, &cell)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &safeboxPos)) return Py_BuildException();
break;
case 3:
if (!PyTuple_GetInteger(poArgs, 0, &window)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &cell)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &safeboxPos)) return Py_BuildException();
break;
}
PythonNetworkStream::Instance().SendSafeBoxCheckinPacket(window, cell, static_cast<uint8_t>(safeboxPos));
return Py_BuildNone();
}
PyObject* netSendSafeboxCheckoutPacket(PyObject*, PyObject* poArgs) {
int safeboxPos = 0; unsigned char window = 1; unsigned short cell = 0xffff;
switch (PyTuple_Size(poArgs)) {
case 2:
if (!PyTuple_GetInteger(poArgs, 0, &safeboxPos)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &cell)) return Py_BuildException();
break;
case 3:
if (!PyTuple_GetInteger(poArgs, 0, &safeboxPos)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &window)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &cell)) return Py_BuildException();
break;
default:
break;
}
PythonNetworkStream::Instance().SendSafeBoxCheckoutPacket(static_cast<uint8_t>(safeboxPos), window, cell);
return Py_BuildNone();
}
PyObject* netSendSafeboxItemMovePacket(PyObject*, PyObject* poArgs) {
int source, target, count;
if (!PyTuple_GetInteger(poArgs, 0, &source)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &target)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &count)) return Py_BuildException();
PythonNetworkStream::Instance().SendSafeBoxItemMovePacket(static_cast<uint8_t>(source), static_cast<uint8_t>(target), static_cast<uint32_t>(count));
return Py_BuildNone();
}
PyObject* netSendMallCheckoutPacket(PyObject*, PyObject* poArgs) {
int mallPos; unsigned char window = 1; unsigned short cell = 0xffff;
switch (PyTuple_Size(poArgs)) {
case 2:
if (!PyTuple_GetInteger(poArgs, 0, &mallPos)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &cell)) return Py_BuildException();
break;
case 3:
if (!PyTuple_GetInteger(poArgs, 0, &mallPos)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &window)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 2, &cell)) return Py_BuildException();
break;
default:
return Py_BuildException();
}
PythonNetworkStream::Instance().SendMallCheckoutPacket(static_cast<uint8_t>(mallPos), window, cell);
return Py_BuildNone();
}
PyObject* netSendAnswerMakeGuildPacket(PyObject*, PyObject* poArgs) {
char* name;
if (!PyTuple_GetString(poArgs, 0, &name)) return Py_BuildException();
PythonNetworkStream::Instance().SendAnswerMakeGuildPacket(name);
return Py_BuildNone();
}
PyObject* netSendQuestInputStringPacket(PyObject*, PyObject* poArgs) {
char* text;
if (!PyTuple_GetString(poArgs, 0, &text)) return Py_BuildException();
PythonNetworkStream::Instance().SendQuestInputStringPacket(text);
return Py_BuildNone();
}
PyObject* netSendQuestInputLongStringPacket(PyObject*, PyObject* poArgs) {
char* text;
if (!PyTuple_GetString(poArgs, 0, &text)) return Py_BuildException();
PythonNetworkStream::Instance().SendQuestInputStringLongPacket(text);
return Py_BuildNone();
}
PyObject* netSendQuestConfirmPacket(PyObject*, PyObject* poArgs) {
int answer, pid;
if (!PyTuple_GetInteger(poArgs, 0, &answer)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &pid)) return Py_BuildException();
PythonNetworkStream::Instance().SendQuestConfirmPacket(static_cast<uint8_t>(answer), pid);
return Py_BuildNone();
}
PyObject* netSendRequestRefineInfoPacket(PyObject*, PyObject* poArgs) {
int slot;
if (!PyTuple_GetInteger(poArgs, 0, &slot)) return Py_BuildException();
// Windows: assert(!"... not used anymore"); nothing is sent.
return Py_BuildNone();
}
PyObject* netSendSelectItemPacket(PyObject*, PyObject* poArgs) {
int itemPos;
if (!PyTuple_GetInteger(poArgs, 0, &itemPos)) return Py_BuildException();
PythonNetworkStream::Instance().SendSelectItemPacket(itemPos);
return Py_BuildNone();
}
PyObject* netTargetInfoLoad(PyObject*, PyObject* poArgs) {
unsigned int vid; // DWORD: Windows' "dwVID < 0" early return can never fire
if (!PyArg_ParseTuple(poArgs, "i", &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendTargetInfoLoadPacket(vid);
return Py_BuildNone();
}
PyObject* netGetGuildID(PyObject*,PyObject*) {return PyInt_FromLong(int32_t(PythonNetworkStream::Instance().GetGuildID()));}
PyObject* netSendGuildAddMemberPacket(PyObject*, PyObject* poArgs) {
int vid;
if (!PyTuple_GetInteger(poArgs, 0, &vid)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildAddMemberPacket(vid);
return Py_BuildNone();
}
PyObject* netSendGuildRemoveMemberPacket(PyObject*, PyObject* poArgs) {
char* key;
if (!PyTuple_GetString(poArgs, 0, &key)) return Py_BuildException();
if (auto* member=GetGuildState().ByName(key))
PythonNetworkStream::Instance().SendGuildRemoveMemberPacket(member->pid);
else
std::cerr << "netSendGuildRemoveMemberPacket(szKey=" << key << ") - Can't Find Guild Member\n";
return Py_BuildNone();
}
PyObject* netSendGuildChangeGradeNamePacket(PyObject*, PyObject* poArgs) {
int grade; char* name;
if (!PyTuple_GetInteger(poArgs, 0, &grade)) return Py_BuildException();
if (!PyTuple_GetString(poArgs, 1, &name)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildChangeGradeNamePacket(static_cast<uint8_t>(grade), name);
return Py_BuildNone();
}
PyObject* netSendGuildChangeGradeAuthorityPacket(PyObject*, PyObject* poArgs) {
int grade, authority;
if (!PyTuple_GetInteger(poArgs, 0, &grade)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &authority)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildChangeGradeAuthorityPacket(static_cast<uint8_t>(grade), static_cast<uint8_t>(authority));
return Py_BuildNone();
}
PyObject* netSendGuildOfferPacket(PyObject*, PyObject* poArgs) {
int experience;
if (!PyTuple_GetInteger(poArgs, 0, &experience)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildOfferPacket(experience);
return Py_BuildNone();
}
PyObject* netSnedGuildPostCommentPacket(PyObject*, PyObject* poArgs) {
char* comment;
if (!PyTuple_GetString(poArgs, 0, &comment)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildPostCommentPacket(comment);
return Py_BuildNone();
}
PyObject* netSnedGuildDeleteCommentPacket(PyObject*, PyObject* poArgs) {
int index;
if (!PyTuple_GetInteger(poArgs, 0, &index)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildDeleteCommentPacket(index);
return Py_BuildNone();
}
PyObject* netSendGuildRefreshCommentsPacket(PyObject*, PyObject* poArgs) {
int highestIndex;
if (!PyTuple_GetInteger(poArgs, 0, &highestIndex)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildRefreshCommentsPacket(highestIndex);
return Py_BuildNone();
}
PyObject* netSendGuildChangeMemberGradePacket(PyObject*, PyObject* poArgs) {
int pid, grade;
if (!PyTuple_GetInteger(poArgs, 0, &pid)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &grade)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildChangeMemberGradePacket(pid, static_cast<uint8_t>(grade));
return Py_BuildNone();
}
PyObject* netSendGuildUseSkillPacket(PyObject*, PyObject* poArgs) {
int skillID, targetVID;
if (!PyTuple_GetInteger(poArgs, 0, &skillID)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &targetVID)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildUseSkillPacket(skillID, targetVID);
return Py_BuildNone();
}
PyObject* netSendGuildChangeMemberGeneralPacket(PyObject*, PyObject* poArgs) {
int pid, flag;
if (!PyTuple_GetInteger(poArgs, 0, &pid)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &flag)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildChangeMemberGeneralPacket(pid, static_cast<uint8_t>(flag));
return Py_BuildNone();
}
PyObject* netSendGuildInviteAnswerPacket(PyObject*, PyObject* poArgs) {
int guildID, answer;
if (!PyTuple_GetInteger(poArgs, 0, &guildID)) return Py_BuildException();
if (!PyTuple_GetInteger(poArgs, 1, &answer)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildInviteAnswerPacket(guildID, static_cast<uint8_t>(answer));
return Py_BuildNone();
}
PyObject* netSendGuildChargeGSPPacket(PyObject*, PyObject* poArgs) {
int gsp;
if (!PyTuple_GetInteger(poArgs, 0, &gsp)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildChargeGSPPacket(gsp);
return Py_BuildNone();
}
PyObject* netSendGuildDepositMoneyPacket(PyObject*, PyObject* poArgs) {
int money;
if (!PyTuple_GetInteger(poArgs, 0, &money)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildDepositMoneyPacket(money);
return Py_BuildNone();
}
PyObject* netSendGuildWithdrawMoneyPacket(PyObject*, PyObject* poArgs) {
int money;
if (!PyTuple_GetInteger(poArgs, 0, &money)) return Py_BuildException();
PythonNetworkStream::Instance().SendGuildWithdrawMoneyPacket(money);
return Py_BuildNone();
}
PyObject* net_get_main_actor_vid(PyObject*, PyObject*) {
uint32_t vid = PythonNetworkStream::Instance().GetMainActorVID();
if (vid == 0 && has_mock_characters) vid = 1001;
@@ -377,6 +720,13 @@ PyObject* send_item_move_packet(PyObject*, PyObject* args) {
} // namespace
void update_player_guild(uint32_t id,const std::string& name) {
if(has_mock_characters) {
for(auto& c:mock_characters)if(c.name==GetMainCharacterName()) {c.guild_id=id;c.guild_name=name;}
}
client.update_player_guild(GetMainCharacterName(),id,name);
}
const CharacterMoveState& get_last_character_move() {
return last_move_state;
}
@@ -393,6 +743,33 @@ void SetItemMovePacketCallback(ItemMovePacketCallback cb) {
s_itemMoveCallback = cb;
}
// AVA2 PythonNetworkStreamModule.cpp: server-command / chat-filter / emoticon wrappers.
std::vector<std::string> preserved_commands; // g_kList_strCommand
PyObject* server_command_parser=nullptr;
static PyObject* net_preserve_server_command(PyObject*, PyObject* args) { char* line;if(!PyTuple_GetString(args,0,&line)) return Py_BuildException();preserved_commands.push_back(line);return Py_BuildNone(); }
static PyObject* net_get_preserved_server_command(PyObject*, PyObject*) {
if(preserved_commands.empty()) return Py_BuildValue("s","");
std::string command=preserved_commands.front();preserved_commands.erase(preserved_commands.begin());
return Py_BuildValue("s",command.c_str());
}
static PyObject* net_set_server_command_parser_window(PyObject*, PyObject* args) {
PyObject* window;if(!PyTuple_GetObject(args,0,&window)) return Py_BuildException();
replace(server_command_parser,window);PythonNetworkStream::Instance().SetServerCommandParserWindow(server_command_parser);return Py_BuildNone();
}
// netLoadInsultList / netIsChatInsultIn / netIsInsultIn (AVA2 PythonNetworkStreamModule.cpp).
bool LoadInsultList(const std::string& path) {
std::string text;
try { text=ReadPackedText(path); } catch(const std::exception&) { return false; }
return PythonNetworkStream::Instance().LoadInsultList(text);
}
static PyObject* net_load_insult_list(PyObject*, PyObject* args) { char* path;if(!PyTuple_GetString(args,0,&path)) return Py_BuildException();return Py_BuildValue("i",LoadInsultList(path)); }
static PyObject* net_is_chat_insult_in(PyObject*, PyObject* args) { char* msg;if(!PyTuple_GetString(args,0,&msg)) return Py_BuildException();return Py_BuildValue("i",PythonNetworkStream::Instance().IsChatInsultIn(msg)); }
static PyObject* net_is_insult_in(PyObject*, PyObject* args) { char* msg;if(!PyTuple_GetString(args,0,&msg)) return Py_BuildException();return Py_BuildValue("i",PythonNetworkStream::Instance().IsInsultIn(msg)); }
static PyObject* net_enable_chat_insult_filter(PyObject*, PyObject* args) { int enable;if(!PyTuple_GetInteger(args,0,&enable)) return Py_BuildException();PythonNetworkStream::Instance().EnableChatInsultFilter(enable!=0);return Py_BuildNone(); }
static PyObject* net_set_empire_language_mode(PyObject*, PyObject* args) { int mode;if(!PyTuple_GetInteger(args,0,&mode)) return Py_BuildException();PythonNetworkStream::Instance().SetEmpireLanguageMode(mode!=0);return Py_BuildNone(); }
static PyObject* net_register_emoticon_string(PyObject*, PyObject* args) { char* text;if(!PyTuple_GetString(args,0,&text)) return Py_BuildException();PythonNetworkStream::Instance().RegisterEmoticonString(text);return Py_BuildNone(); }
static PyObject* net_send_emoticon(PyObject*, PyObject* args) { int emoticon;if(!PyTuple_GetInteger(args,0,&emoticon)) return Py_BuildException();PythonNetworkStream::Instance().SendEmoticon(unsigned(emoticon));return Py_BuildNone(); }
static PyObject* net_send_refine_packet(PyObject*, PyObject* args) {
int targetPos = 0, type = 0, specialStorage = 0, indexSelect = -1;
if (PyArg_ParseTuple(args, "iiii", &targetPos, &type, &specialStorage, &indexSelect)) {
@@ -460,30 +837,30 @@ void initnet() {
{"Update", update, METH_NOARGS, nullptr},
{"GetConnectionState", status, METH_NOARGS, nullptr},
{"GetBettingGuildWarValue", net_dummy_zero, METH_VARARGS, nullptr},
{"EnableChatInsultFilter", net_dummy_none, METH_VARARGS, nullptr},
{"EnableChatInsultFilter", net_enable_chat_insult_filter, METH_VARARGS, nullptr},
{"SetServerInfo", net_dummy_none, METH_VARARGS, nullptr},
{"GetServerInfo", net_dummy_str, METH_VARARGS, nullptr},
{"PreserveServerCommand", net_dummy_none, METH_VARARGS, nullptr},
{"GetPreservedServerCommand", net_dummy_str, METH_VARARGS, nullptr},
{"PreserveServerCommand", net_preserve_server_command, METH_VARARGS, nullptr},
{"GetPreservedServerCommand", net_get_preserved_server_command, METH_VARARGS, nullptr},
{"StartGame", net_start_game, METH_VARARGS, nullptr},
{"Warp", net_warp, METH_VARARGS, nullptr},
{"IsTest", net_dummy_zero, METH_VARARGS, nullptr},
{"SetMarkServer", net_dummy_none, METH_VARARGS, nullptr},
{"IsChatInsultIn", net_dummy_zero, METH_VARARGS, nullptr},
{"IsInsultIn", net_dummy_zero, METH_VARARGS, nullptr},
{"LoadInsultList", net_dummy_none, METH_VARARGS, nullptr},
{"IsChatInsultIn", net_is_chat_insult_in, METH_VARARGS, nullptr},
{"IsInsultIn", net_is_insult_in, METH_VARARGS, nullptr},
{"LoadInsultList", net_load_insult_list, METH_VARARGS, nullptr},
{"UploadMark", net_dummy_none, METH_VARARGS, nullptr},
{"UploadSymbol", net_dummy_none, METH_VARARGS, nullptr},
{"GetGuildID", net_dummy_zero, METH_VARARGS, nullptr},
{"GetGuildID", netGetGuildID, METH_VARARGS, nullptr},
{"GetMainActorVID", net_get_main_actor_vid, METH_VARARGS, nullptr},
{"GetMainActorRace", net_get_main_actor_race, METH_VARARGS, nullptr},
{"GetMainActorEmpire", net_get_main_actor_empire, METH_VARARGS, nullptr},
{"GetMainActorSkillGroup", net_get_main_actor_skill_group, METH_VARARGS, nullptr},
{"SendTargetInfoLoad", net_dummy_none, METH_VARARGS, nullptr},
{"SendTargetInfoLoad", netTargetInfoLoad, METH_VARARGS, nullptr},
{"GetFieldMusicFileName", net_get_field_music_name, METH_VARARGS, nullptr},
{"GetFieldMusicVolume", net_get_field_music_volume, METH_VARARGS, nullptr},
{"ToggleGameDebugInfo", net_dummy_none, METH_VARARGS, nullptr},
{"SetServerCommandParserWindow", net_dummy_none, METH_VARARGS, nullptr},
{"SetServerCommandParserWindow", net_set_server_command_parser_window, METH_VARARGS, nullptr},
{"SetTCPRecvBufferSize", net_dummy_none, METH_VARARGS, nullptr},
{"SetTCPSendBufferSize", net_dummy_none, METH_VARARGS, nullptr},
{"SetUDPRecvBufferSize", net_dummy_none, METH_VARARGS, nullptr},
@@ -514,7 +891,7 @@ void initnet() {
{"SetOfflinePhase", net_dummy_none, METH_VARARGS, nullptr},
{"IsConnect", is_connected, METH_VARARGS, nullptr},
{"SendChatPacket", net_send_chat, METH_VARARGS, nullptr},
{"SendEmoticon", net_dummy_none, METH_VARARGS, nullptr},
{"SendEmoticon", net_send_emoticon, METH_VARARGS, nullptr},
{"SendWhisperPacket", net_send_whisper, METH_VARARGS, nullptr},
{"SendMobileMessagePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendCharacterPositionPacket", send_character_position_packet, METH_VARARGS, nullptr},
@@ -524,57 +901,57 @@ void initnet() {
{"SendShopBuyPacket", shop_buy, METH_VARARGS, nullptr},
{"SendShopSellPacket", shop_sell, METH_VARARGS, nullptr},
{"SendShopSellPacketNew", shop_sell_new, METH_VARARGS, nullptr},
{"SendExchangeStartPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeItemAddPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeItemDelPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeElkAddPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeAcceptPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeExitPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendExchangeStartPacket", netSendExchangeStartPacket, METH_VARARGS, nullptr},
{"SendExchangeItemAddPacket", netSendExchangeItemAddPacket, METH_VARARGS, nullptr},
{"SendExchangeItemDelPacket", netSendExchangeItemDelPacket, METH_VARARGS, nullptr},
{"SendExchangeElkAddPacket", netSendExchangeElkAddPacket, METH_VARARGS, nullptr},
{"SendExchangeAcceptPacket", netSendExchangeAcceptPacket, METH_VARARGS, nullptr},
{"SendExchangeExitPacket", netSendExchangeExitPacket, METH_VARARGS, nullptr},
{"SendOnClickPacket", net_send_onclick, METH_VARARGS, nullptr},
{"RegisterEmoticonString", net_dummy_none, METH_VARARGS, nullptr},
{"SendMessengerAddByVIDPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendMessengerAddByNamePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendMessengerRemovePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyInvitePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyInviteAnswerPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyExitPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyRemovePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyRemovePacketPID", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyRemovePacketVID", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartySetStatePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyUseSkillPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendPartyParameterPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendSafeboxSaveMoneyPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendSafeboxWithdrawMoneyPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendSafeboxCheckinPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendSafeboxCheckoutPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendSafeboxItemMovePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendMallCheckoutPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendAnswerMakeGuildPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendQuestInputStringPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendQuestInputLongStringPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendQuestConfirmPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildAddMemberPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildRemoveMemberPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildChangeGradeNamePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildChangeGradeAuthorityPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildOfferPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildPostCommentPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildDeleteCommentPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildRefreshCommentsPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildChangeMemberGradePacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildUseSkillPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildChangeMemberGeneralPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildInviteAnswerPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildChargeGSPPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildDepositMoneyPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildWithdrawMoneyPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SendRequestRefineInfoPacket", net_dummy_none, METH_VARARGS, nullptr},
{"RegisterEmoticonString", net_register_emoticon_string, METH_VARARGS, nullptr},
{"SendMessengerAddByVIDPacket", netSendMessengerAddByVIDPacket, METH_VARARGS, nullptr},
{"SendMessengerAddByNamePacket", netSendMessengerAddByNamePacket, METH_VARARGS, nullptr},
{"SendMessengerRemovePacket", netSendMessengerRemovePacket, METH_VARARGS, nullptr},
{"SendPartyInvitePacket", netSendPartyInvitePacket, METH_VARARGS, nullptr},
{"SendPartyInviteAnswerPacket", netSendPartyInviteAnswerPacket, METH_VARARGS, nullptr},
{"SendPartyExitPacket", netSendPartyExitPacket, METH_VARARGS, nullptr},
{"SendPartyRemovePacket", netSendPartyRemovePacketPID, METH_VARARGS, nullptr},
{"SendPartyRemovePacketPID", netSendPartyRemovePacketPID, METH_VARARGS, nullptr},
{"SendPartyRemovePacketVID", netSendPartyRemovePacketVID, METH_VARARGS, nullptr},
{"SendPartySetStatePacket", netSendPartySetStatePacket, METH_VARARGS, nullptr},
{"SendPartyUseSkillPacket", netSendPartyUseSkillPacket, METH_VARARGS, nullptr},
{"SendPartyParameterPacket", netSendPartyParameterPacket, METH_VARARGS, nullptr},
{"SendSafeboxSaveMoneyPacket", netSendSafeboxSaveMoneyPacket, METH_VARARGS, nullptr},
{"SendSafeboxWithdrawMoneyPacket", netSendSafeboxWithdrawMoneyPacket, METH_VARARGS, nullptr},
{"SendSafeboxCheckinPacket", netSendSafeboxCheckinPacket, METH_VARARGS, nullptr},
{"SendSafeboxCheckoutPacket", netSendSafeboxCheckoutPacket, METH_VARARGS, nullptr},
{"SendSafeboxItemMovePacket", netSendSafeboxItemMovePacket, METH_VARARGS, nullptr},
{"SendMallCheckoutPacket", netSendMallCheckoutPacket, METH_VARARGS, nullptr},
{"SendAnswerMakeGuildPacket", netSendAnswerMakeGuildPacket, METH_VARARGS, nullptr},
{"SendQuestInputStringPacket", netSendQuestInputStringPacket, METH_VARARGS, nullptr},
{"SendQuestInputLongStringPacket", netSendQuestInputLongStringPacket, METH_VARARGS, nullptr},
{"SendQuestConfirmPacket", netSendQuestConfirmPacket, METH_VARARGS, nullptr},
{"SendGuildAddMemberPacket", netSendGuildAddMemberPacket, METH_VARARGS, nullptr},
{"SendGuildRemoveMemberPacket", netSendGuildRemoveMemberPacket, METH_VARARGS, nullptr},
{"SendGuildChangeGradeNamePacket", netSendGuildChangeGradeNamePacket, METH_VARARGS, nullptr},
{"SendGuildChangeGradeAuthorityPacket", netSendGuildChangeGradeAuthorityPacket, METH_VARARGS, nullptr},
{"SendGuildOfferPacket", netSendGuildOfferPacket, METH_VARARGS, nullptr},
{"SendGuildPostCommentPacket", netSnedGuildPostCommentPacket, METH_VARARGS, nullptr},
{"SendGuildDeleteCommentPacket", netSnedGuildDeleteCommentPacket, METH_VARARGS, nullptr},
{"SendGuildRefreshCommentsPacket", netSendGuildRefreshCommentsPacket, METH_VARARGS, nullptr},
{"SendGuildChangeMemberGradePacket", netSendGuildChangeMemberGradePacket, METH_VARARGS, nullptr},
{"SendGuildUseSkillPacket", netSendGuildUseSkillPacket, METH_VARARGS, nullptr},
{"SendGuildChangeMemberGeneralPacket", netSendGuildChangeMemberGeneralPacket, METH_VARARGS, nullptr},
{"SendGuildInviteAnswerPacket", netSendGuildInviteAnswerPacket, METH_VARARGS, nullptr},
{"SendGuildChargeGSPPacket", netSendGuildChargeGSPPacket, METH_VARARGS, nullptr},
{"SendGuildDepositMoneyPacket", netSendGuildDepositMoneyPacket, METH_VARARGS, nullptr},
{"SendGuildWithdrawMoneyPacket", netSendGuildWithdrawMoneyPacket, METH_VARARGS, nullptr},
{"SendRequestRefineInfoPacket", netSendRequestRefineInfoPacket, METH_VARARGS, nullptr},
{"SendRefinePacket", net_send_refine_packet, METH_VARARGS, nullptr},
{"SendScriptAnswerPacket", net_send_script_answer_packet, METH_VARARGS, nullptr},
{"SendScriptButtonPacket", net_send_script_button_packet, METH_VARARGS, nullptr},
{"SendSelectItemPacket", net_dummy_none, METH_VARARGS, nullptr},
{"SetEmpireLanguageMode", net_dummy_none, METH_VARARGS, nullptr},
{"SendSelectItemPacket", netSendSelectItemPacket, METH_VARARGS, nullptr},
{"SetEmpireLanguageMode", net_set_empire_language_mode, METH_VARARGS, nullptr},
{"SetSkillGroupFake", net_dummy_none, METH_VARARGS, nullptr},
{"SendGuildSymbol", net_dummy_none, METH_VARARGS, nullptr},
{"DisconnectUploader", net_dummy_none, METH_VARARGS, nullptr},
@@ -602,7 +979,7 @@ void initnet() {
{"CalendarOpen", net_dummy_none, METH_VARARGS, nullptr},
{"CalendarClose", net_dummy_none, METH_VARARGS, nullptr},
{"CalendarSend", net_dummy_none, METH_VARARGS, nullptr},
{"SendPrivateShopSearchInfo", net_dummy_none, METH_VARARGS, nullptr},
{"SendPrivateShopSearchInfo", netSendPrivateShopSearchInfo, METH_VARARGS, nullptr},
{"SendMiniGameCatchKingStart", net_dummy_none, METH_VARARGS, nullptr},
{"SendMiniGameCatchKingDeckCardClick", net_dummy_none, METH_VARARGS, nullptr},
{"SendMiniGameCatchKingFieldCardClick", net_dummy_none, METH_VARARGS, nullptr},
@@ -720,10 +1097,10 @@ void pump_python_net() {
}
}
auto& stream=PythonNetworkStream::Instance();
stream.PushRecvData(client.take_game_input());
stream.PushRecvData(client.take_game_input(stream.RecvBufferSpace()));
stream.ProcessRecvData();
if(client.status()==LoginClient::Status::Loading) {
for(auto& packet:stream.PopSendPackets()) client.send_game_packet(std::move(packet));
for(auto& [packet,sequence]:stream.PopSendPacketsWithSequence()) client.send_game_packet(std::move(packet),sequence);
}
}