feat(parity): implement sash system, fishing raycasting, guild area events, packet subheaders, and item links (pass 36)

This commit is contained in:
shen
2026-10-08 03:07:36 -07:00
parent efd3a44fa0
commit 263c96aaa4
10 changed files with 468 additions and 113 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"reference": "upstream/ava2-client/UserInterface/Packet.h preprocessed with AVA2 Windows feature headers",
"checked": 301,
"checked": 395,
"mismatches": [],
"unmatched": []
}
+27
View File
@@ -806,4 +806,31 @@ Validation: macOS build and Android arm64 libmain.so pass. Five targeted CTests
- CTest suite: **41/41 tests passed (100%)**.
- Android arm64 `libmain.so` and macOS arm64 `ava2_client` build cleanly.
## 2026-10-08 pass36 — Packet subheader enums expansion, sash system, fishing raycasting, guild area event, and item link parity
- **Packet Subheader Enums Expansion (`src/eter_net/Packet.h`, `tools/audit_ava2_packet_constants.py`)**:
- Added explicit numeric definitions for all subheader enum groups: `EMessengerSubheaderGC` (0..4), `EFishingSubheaderGC` (0..5), `EDungeonSubheaderGC` (0..1), `EDSSubHeader` (0..11), `ESashSubheader` (GC 0..4, CG 0..3), `EKingdomsWarSubheaderGC` (0..1), `GUILD_SUBHEADER_GC_` (0..20), `EShopSubheaderCG` (0..16), and `EShopSubheaderGC` (0..19).
- Expanded packet constant audit regex to cover all subheader families.
- Audited packet constants increased from 301 to **395/395 (100% parity)** with 0 mismatches and 0 unmatched.
- **Sash System Full Parity (`src/python_sash.h`, `src/python_native_modules.cpp`, `src/eter_net/PythonNetworkStreamPhaseGameRecv.cpp`)**:
- Implemented `CPythonSash` singleton replicating `UserInterface/PythonSash.h` with material/result state tracking (`dwPrice`, `m_vSashMaterials`, `m_vSashResult`).
- Implemented `PythonNetworkStream` sash client-to-server methods: `SendSashClosePacket()`, `SendSashAddPacket(TItemPos, uint8_t)`, `SendSashRemovePacket(uint8_t)`, `SendSashRefinePacket()`.
- Wired `sash` Python module methods (`SendCloseRequest`, `Add`, `Remove`, `GetPrice`, `GetAttachedItem`, `GetResultItem`, `SendRefineRequest`) directly to network stream and singleton.
- Updated `RecvSashPacket()` to update `CPythonSash::Instance()` state on `SASH_SUBHEADER_GC_ADDED`, `REMOVED`, `OPEN`, `CLOSE`, `REFINED` and corrected action code 5 on `SASH_SUBHEADER_CG_REFINED`.
- **Fishing System & Character State Parity (`src/python_gameplay_modules.cpp`, `src/eter_net/PythonNetworkStream.h`, `.cpp`)**:
- Added and implemented `SendFishingPacket(int iRotation)` sending `HEADER_CG_FISHING`.
- Implemented `NEW_Fishing()` and `NEW_CancelFishing()` with 10-degree radial raycasting across 180 degrees using `CPythonBackground::Instance().IsAttrOn(x, y, 2 /* ATTRIBUTE_WATER */)` at distance 600.0f, exactly replicating upstream `CInstanceBase::GetFishingRot`.
- Added fishing rod equipment check (`ITEM_TYPE_ROD = 13`) in `IsMainActorFishingMode()`.
- Connected fishing skill slot click (`c_iSkillIndex_Fishing = 123` / 121) in `ClickSkillSlot`.
- Wired `player.SetAttackKeyState`, `player.SetSingleDIKKeyState`, and `player.EndKeyWalkingImmediately` to cancel fishing and track attack key state (`s_isAtkKey`).
- Implemented `player.SetAutoCameraRotationSpeed` saving `s_fCmrRotSpd`.
- Implemented `player.Update` to notify guild area transitions (`BINARY_Guild_EnterGuildArea`/`ExitGuildArea`) via `CPythonMiniMap::Instance().GetGuildAreaID(x, y)`.
- Fixed `player.GetItemLink` to format all 8 sockets, 15 attributes, and 7 glove random attributes.
- Fixed `player.GetItemRandomAttribute` bounds check to `GLOVE_ATTR_MAX_NUM` (7).
- **Results**:
- Checked packet constants: **395/395 (100%)**, 0 mismatches, 0 unmatched.
- `python3 tools/audit_windows_parity.py`: **0 placeholder bindings**.
- `python3 tools/audit_ava2_python_interfaces.py`: **46 Windows modules compared; 0 missing methods; 0 overlapping placeholder methods**.
- CTest suite: **41/41 tests passed (100%)**.
- Android arm64 `libmain.so` and macOS arm64 `ava2_client` build cleanly.
+122 -41
View File
@@ -159,8 +159,11 @@ enum EMessengerSubheaderCG : uint8_t {
MESSENGER_SUBHEADER_CG_REMOVE = 2,
};
enum EMessengerSubheaderGC : uint8_t {
MESSENGER_SUBHEADER_GC_LIST, MESSENGER_SUBHEADER_GC_LOGIN,
MESSENGER_SUBHEADER_GC_LOGOUT, MESSENGER_SUBHEADER_GC_INVITE, MESSENGER_SUBHEADER_GC_MOBILE
MESSENGER_SUBHEADER_GC_LIST = 0,
MESSENGER_SUBHEADER_GC_LOGIN = 1,
MESSENGER_SUBHEADER_GC_LOGOUT = 2,
MESSENGER_SUBHEADER_GC_INVITE = 3,
MESSENGER_SUBHEADER_GC_MOBILE = 4,
};
enum EMessengerConnectedState : uint8_t {
MESSENGER_CONNECTED_STATE_OFFLINE, MESSENGER_CONNECTED_STATE_ONLINE, MESSENGER_CONNECTED_STATE_MOBILE
@@ -957,23 +960,53 @@ struct TPacketGCSafeboxWrongPassword {
// ── GamePhase packets ported 2026-10-06 (AVA2 UserInterface/Packet.h, ENABLE_* as built) ──
enum EPVPModes { PVP_MODE_NONE, PVP_MODE_AGREE, PVP_MODE_FIGHT, PVP_MODE_REVENGE };
enum EFishingSubheaderGC { FISHING_SUBHEADER_GC_START, FISHING_SUBHEADER_GC_STOP, FISHING_SUBHEADER_GC_REACT,
FISHING_SUBHEADER_GC_SUCCESS, FISHING_SUBHEADER_GC_FAIL, FISHING_SUBHEADER_GC_FISH };
enum EDungeonSubheaderGC { DUNGEON_SUBHEADER_GC_TIME_ATTACK_START, DUNGEON_SUBHEADER_GC_DESTINATION_POSITION };
enum EFishingSubheaderGC {
FISHING_SUBHEADER_GC_START = 0,
FISHING_SUBHEADER_GC_STOP = 1,
FISHING_SUBHEADER_GC_REACT = 2,
FISHING_SUBHEADER_GC_SUCCESS = 3,
FISHING_SUBHEADER_GC_FAIL = 4,
FISHING_SUBHEADER_GC_FISH = 5
};
enum EDungeonSubheaderGC {
DUNGEON_SUBHEADER_GC_TIME_ATTACK_START = 0,
DUNGEON_SUBHEADER_GC_DESTINATION_POSITION = 1
};
enum EMultiRefine { MULTIREFINE_CLEAR_INFO, MULTIREFINE_ADD_INFO, MULTIREFINE_LOAD_INFO, MULTIREFINE_OPEN,
MULTIREFINE_SEND_DATES, MULTIREFINE_SEND_DATES_CLEAR };
enum EDSSubHeader { DS_SUB_HEADER_OPEN, DS_SUB_HEADER_CLOSE, DS_SUB_HEADER_DO_UPGRADE, DS_SUB_HEADER_DO_IMPROVEMENT,
DS_SUB_HEADER_DO_REFINE, DS_SUB_HEADER_REFINE_FAIL, DS_SUB_HEADER_REFINE_FAIL_MAX_REFINE,
DS_SUB_HEADER_REFINE_FAIL_INVALID_MATERIAL, DS_SUB_HEADER_REFINE_FAIL_NOT_ENOUGH_MONEY,
DS_SUB_HEADER_REFINE_FAIL_NOT_ENOUGH_MATERIAL, DS_SUB_HEADER_REFINE_FAIL_TOO_MUCH_MATERIAL,
DS_SUB_HEADER_REFINE_SUCCEED };
enum ESashSubheader { SASH_SUBHEADER_GC_OPEN, SASH_SUBHEADER_GC_CLOSE, SASH_SUBHEADER_GC_ADDED,
SASH_SUBHEADER_GC_REMOVED, SASH_SUBHEADER_CG_REFINED };
enum EDSSubHeader {
DS_SUB_HEADER_OPEN = 0,
DS_SUB_HEADER_CLOSE = 1,
DS_SUB_HEADER_DO_UPGRADE = 2,
DS_SUB_HEADER_DO_IMPROVEMENT = 3,
DS_SUB_HEADER_DO_REFINE = 4,
DS_SUB_HEADER_REFINE_FAIL = 5,
DS_SUB_HEADER_REFINE_FAIL_MAX_REFINE = 6,
DS_SUB_HEADER_REFINE_FAIL_INVALID_MATERIAL = 7,
DS_SUB_HEADER_REFINE_FAIL_NOT_ENOUGH_MONEY = 8,
DS_SUB_HEADER_REFINE_FAIL_NOT_ENOUGH_MATERIAL = 9,
DS_SUB_HEADER_REFINE_FAIL_TOO_MUCH_MATERIAL = 10,
DS_SUB_HEADER_REFINE_SUCCEED = 11
};
enum ESashSubheader {
SASH_SUBHEADER_GC_OPEN = 0,
SASH_SUBHEADER_GC_CLOSE = 1,
SASH_SUBHEADER_GC_ADDED = 2,
SASH_SUBHEADER_GC_REMOVED = 3,
SASH_SUBHEADER_CG_REFINED = 4,
SASH_SUBHEADER_CG_CLOSE = 0,
SASH_SUBHEADER_CG_ADD = 1,
SASH_SUBHEADER_CG_REMOVE = 2,
SASH_SUBHEADER_CG_REFINE = 3
};
enum ECalendarSubheader { CALENDAR_SUB_HEADER_OPEN, CALENDAR_SUB_HEADER_CLOSE, CALENDAR_SUB_HEADER_SEND_EVENT,
CALENDAR_RECEIVE_EVENTS, CALENDAR_RECEIVE_OPEN, CALENDAR_RECEIVE_CLEAR_EVENTS, CALENDAR_RECEIVE_LOAD_EVENTS,
CALENDAR_RECEIVE_LOADING_EVENTS, CALENDAR_RECEIVE_OPEN_ADM, CALENDAR_RECEIVE_CLEAR_EVENTS_ADM,
CALENDAR_RECEIVE_LOAD_EVENTS_ADM, CALENDAR_RECEIVE_LOADING_EVENTS_ADM };
enum EKingdomsWarSubheaderGC { KINGDOMSWAR_SUBHEADER_GC_OPEN, KINGDOMSWAR_SUBHEADER_GC_REFRESH };
enum EKingdomsWarSubheaderGC {
KINGDOMSWAR_SUBHEADER_GC_OPEN = 0,
KINGDOMSWAR_SUBHEADER_GC_REFRESH = 1
};
enum EEventManagerSubheader { EVENT_MANAGER_LOAD, EVENT_MANAGER_EVENT_STATUS, EVENT_MANAGER_REMOVE_EVENT, EVENT_MANAGER_UPDATE };
enum EExchangeLogSubheader { SUB_EXCHANGELOG_LOAD, SUB_EXCHANGELOG_LOAD_ITEM };
enum ECatchKingSubheaderGC { SUBHEADER_GC_CATCH_KING_EVENT_INFO, SUBHEADER_GC_CATCH_KING_START,
@@ -1005,13 +1038,46 @@ struct TOfflineShopItemData {
uint8_t status;char szBuyerName[CHARACTER_NAME_MAX_LEN+1];uint32_t owner_id;
};
constexpr uint8_t HEADER_GC_OFFLINE_SHOP=47,HEADER_CG_MY_OFFLINE_SHOP=58;
enum EOfflineShopGCSubheader : uint8_t {
SHOP_SUBHEADER_GC_START=0,SHOP_SUBHEADER_GC_END=1,SHOP_SUBHEADER_GC_UPDATE_ITEM=2,
SHOP_SUBHEADER_GC_OK=4,SHOP_SUBHEADER_GC_NOT_ENOUGH_MONEY=5,
SHOP_SUBHEADER_GC_INVENTORY_FULL=7,SHOP_SUBHEADER_GC_INVALID_POS=8,SHOP_SUBHEADER_GC_SOLD_OUT=9,
SHOP_SUBHEADER_GC_REFRESH_MONEY=13,SHOP_SUBHEADER_GC_CHECK_RESULT=14,
SHOP_SUBHEADER_GC_REFRESH_DISPLAY_COUNT=15,SHOP_SUBHEADER_GC_REALWATCHER_COUNT=16,
SHOP_SUBHEADER_GC_REFRESH_COUNT=17,SHOP_SUBHEADER_GC_CHANGE_TITLE=18,SHOP_SUBHEADER_GC_NOT_ENOUGH_LUCKY=19
enum EShopSubheaderCG : uint8_t {
SHOP_SUBHEADER_CG_END = 0,
SHOP_SUBHEADER_CG_BUY = 1,
SHOP_SUBHEADER_CG_SELL = 2,
SHOP_SUBHEADER_CG_SELL2 = 3,
SHOP_SUBHEADER_CG_ADD_ITEM = 4,
SHOP_SUBHEADER_CG_REMOVE_ITEM = 5,
SHOP_SUBHEADER_CG_DESTROY_OFFLINE_SHOP = 6,
SHOP_SUBHEADER_CG_CHECK = 7,
SHOP_SUBHEADER_CG_BUTTON = 8,
SHOP_SUBHEADER_CG_CHANGE_TITLE = 9,
SHOP_SUBHEADER_CG_TAKE_MONEY = 10,
SHOP_SUBHEADER_CG_LOG_REMOVE = 11,
SHOP_SUBHEADER_CG_CHANGE_DECORATION = 12,
SHOP_SUBHEADER_CG_OPEN_SLOT = 13,
SHOP_SUBHEADER_CG_GET_ITEM = 14,
SHOP_SUBHEADER_CG_ADD_TIME = 15,
SHOP_SUBHEADER_CG_OPEN_WITH_VID = 16
};
enum EShopSubheaderGC : uint8_t {
SHOP_SUBHEADER_GC_START = 0,
SHOP_SUBHEADER_GC_END = 1,
SHOP_SUBHEADER_GC_UPDATE_ITEM = 2,
SHOP_SUBHEADER_GC_UPDATE_PRICE = 3,
SHOP_SUBHEADER_GC_OK = 4,
SHOP_SUBHEADER_GC_NOT_ENOUGH_MONEY = 5,
SHOP_SUBHEADER_GC_SOLDOUT = 6,
SHOP_SUBHEADER_GC_INVENTORY_FULL = 7,
SHOP_SUBHEADER_GC_INVALID_POS = 8,
SHOP_SUBHEADER_GC_SOLD_OUT = 9,
SHOP_SUBHEADER_GC_START_EX = 10,
SHOP_SUBHEADER_GC_NOT_ENOUGH_MONEY_EX = 11,
SHOP_SUBHEADER_GC_NOT_ENOUGH_COUNT = 12,
SHOP_SUBHEADER_GC_REFRESH_MONEY = 13,
SHOP_SUBHEADER_GC_CHECK_RESULT = 14,
SHOP_SUBHEADER_GC_REFRESH_DISPLAY_COUNT = 15,
SHOP_SUBHEADER_GC_REALWATCHER_COUNT = 16,
SHOP_SUBHEADER_GC_REFRESH_COUNT = 17,
SHOP_SUBHEADER_GC_CHANGE_TITLE = 18,
SHOP_SUBHEADER_GC_NOT_ENOUGH_LUCKY = 19
};
struct TShopLog { char name[25],date[25];uint32_t itemVnum,itemCount;int64_t price; };
struct TPacketGCShop { uint8_t header;uint16_t size;uint8_t subheader; };
@@ -1109,6 +1175,21 @@ struct TPacketGCCalendarReceive {
uint32_t dwDuration, dwCurrentTimeStamp;
};
struct TPacketGCCalendarReceiveADM { uint8_t header, bSubType; int32_t index_event; char event[100], event_descript[100]; };
enum ESashInfo {
SASH_ABSORPTION_SOCKET = 0,
SASH_ABSORBED_SOCKET = 1,
SASH_CLEAN_ATTR_VALUE0 = 7,
SASH_WINDOW_MAX_MATERIALS = 2,
};
struct TSashMaterial {
uint8_t bHere = 0;
uint16_t wCell = 0;
};
struct TSashResult {
uint32_t dwItemVnum = 0;
uint32_t dwMinAbs = 0;
uint32_t dwMaxAbs = 0;
};
struct TPacketSash {
uint8_t header, subheader; uint8_t bWindow; uint32_t dwPrice; uint8_t bPos; TItemPos tPos;
uint32_t dwItemVnum, dwMinAbs, dwMaxAbs;
@@ -1289,27 +1370,27 @@ AVA2_PACKET_SIZE(TIShopData,49);AVA2_PACKET_SIZE(TIShopLogData,90);AVA2_PACKET_S
#pragma pack(push,1)
enum
{
GUILD_SUBHEADER_GC_LOGIN,
GUILD_SUBHEADER_GC_LOGOUT,
GUILD_SUBHEADER_GC_LIST,
GUILD_SUBHEADER_GC_GRADE,
GUILD_SUBHEADER_GC_ADD,
GUILD_SUBHEADER_GC_REMOVE,
GUILD_SUBHEADER_GC_GRADE_NAME,
GUILD_SUBHEADER_GC_GRADE_AUTH,
GUILD_SUBHEADER_GC_INFO,
GUILD_SUBHEADER_GC_COMMENTS,
GUILD_SUBHEADER_GC_CHANGE_EXP,
GUILD_SUBHEADER_GC_CHANGE_MEMBER_GRADE,
GUILD_SUBHEADER_GC_SKILL_INFO,
GUILD_SUBHEADER_GC_CHANGE_MEMBER_GENERAL,
GUILD_SUBHEADER_GC_GUILD_INVITE,
GUILD_SUBHEADER_GC_WAR,
GUILD_SUBHEADER_GC_GUILD_NAME,
GUILD_SUBHEADER_GC_GUILD_WAR_LIST,
GUILD_SUBHEADER_GC_GUILD_WAR_END_LIST,
GUILD_SUBHEADER_GC_WAR_POINT,
GUILD_SUBHEADER_GC_MONEY_CHANGE,
GUILD_SUBHEADER_GC_LOGIN = 0,
GUILD_SUBHEADER_GC_LOGOUT = 1,
GUILD_SUBHEADER_GC_LIST = 2,
GUILD_SUBHEADER_GC_GRADE = 3,
GUILD_SUBHEADER_GC_ADD = 4,
GUILD_SUBHEADER_GC_REMOVE = 5,
GUILD_SUBHEADER_GC_GRADE_NAME = 6,
GUILD_SUBHEADER_GC_GRADE_AUTH = 7,
GUILD_SUBHEADER_GC_INFO = 8,
GUILD_SUBHEADER_GC_COMMENTS = 9,
GUILD_SUBHEADER_GC_CHANGE_EXP = 10,
GUILD_SUBHEADER_GC_CHANGE_MEMBER_GRADE = 11,
GUILD_SUBHEADER_GC_SKILL_INFO = 12,
GUILD_SUBHEADER_GC_CHANGE_MEMBER_GENERAL = 13,
GUILD_SUBHEADER_GC_GUILD_INVITE = 14,
GUILD_SUBHEADER_GC_WAR = 15,
GUILD_SUBHEADER_GC_GUILD_NAME = 16,
GUILD_SUBHEADER_GC_GUILD_WAR_LIST = 17,
GUILD_SUBHEADER_GC_GUILD_WAR_END_LIST = 18,
GUILD_SUBHEADER_GC_WAR_POINT = 19,
GUILD_SUBHEADER_GC_MONEY_CHANGE = 20,
};
typedef struct packet_guild
+59
View File
@@ -1844,6 +1844,65 @@ bool PythonNetworkStream::SendScriptButtonPacket(int button) {
Send(bytes.data(),bytes.size());return true;
}
bool PythonNetworkStream::SendFishingPacket(int iRotation) {
uint8_t byHeader = HEADER_CG_FISHING;
uint8_t byPacketRotation = uint8_t(iRotation / 5);
uint8_t buf[2] = { byHeader, byPacketRotation };
Send(buf, sizeof(buf));
return true;
}
bool PythonNetworkStream::SendPointResetPacket() {
PyCallClassMemberFunc(m_phaseWindows[5], "StartPointReset", Py_BuildValue("()"));
return true;
}
bool PythonNetworkStream::SendSashClosePacket() {
if (!main_actor_can_act(m_dwMainActorVID))
return true;
TPacketSash sPacket{};
sPacket.header = HEADER_CG_SASH;
sPacket.subheader = SASH_SUBHEADER_CG_CLOSE;
sPacket.tPos.window_type = 1; // INVENTORY
Send(&sPacket, sizeof(sPacket));
return true;
}
bool PythonNetworkStream::SendSashAddPacket(TItemPos tPos, uint8_t bPos) {
if (!main_actor_can_act(m_dwMainActorVID))
return true;
TPacketSash sPacket{};
sPacket.header = HEADER_CG_SASH;
sPacket.subheader = SASH_SUBHEADER_CG_ADD;
sPacket.bPos = bPos;
sPacket.tPos = tPos;
Send(&sPacket, sizeof(sPacket));
return true;
}
bool PythonNetworkStream::SendSashRemovePacket(uint8_t bPos) {
if (!main_actor_can_act(m_dwMainActorVID))
return true;
TPacketSash sPacket{};
sPacket.header = HEADER_CG_SASH;
sPacket.subheader = SASH_SUBHEADER_CG_REMOVE;
sPacket.bPos = bPos;
sPacket.tPos.window_type = 1; // INVENTORY
Send(&sPacket, sizeof(sPacket));
return true;
}
bool PythonNetworkStream::SendSashRefinePacket() {
if (!main_actor_can_act(m_dwMainActorVID))
return true;
TPacketSash sPacket{};
sPacket.header = HEADER_CG_SASH;
sPacket.subheader = SASH_SUBHEADER_CG_REFINE;
sPacket.tPos.window_type = 1; // INVENTORY
Send(&sPacket, sizeof(sPacket));
return true;
}
} // namespace ava2
namespace ava2 {
+6
View File
@@ -96,6 +96,12 @@ public:
bool SendShootPacket(uint32_t uSkill);
bool SendCharacterPositionPacket(uint8_t iPosition);
bool SendSyncPositionElementPacket(uint32_t victimVID, int32_t victimX, int32_t victimY);
bool SendFishingPacket(int iRotation);
bool SendPointResetPacket();
bool SendSashClosePacket();
bool SendSashAddPacket(TItemPos tPos, uint8_t bPos);
bool SendSashRemovePacket(uint8_t bPos);
bool SendSashRefinePacket();
bool SendWarpPacket();
// ── Exchange Protocol ──
@@ -28,6 +28,7 @@
#include "nonplayer_data.h"
#include "python_event_manager.h"
#include "item_sound.h"
#include "python_sash.h"
#include "NetworkActorManager.h"
#include <cstring>
#include <iostream>
@@ -1127,21 +1128,40 @@ bool PythonNetworkStream::RecvCalendarSystemADM() {
bool PythonNetworkStream::RecvSashPacket() {
TPacketSash p;
if(!Read(sizeof(p),&p)) return false;
// CPythonSash material/result store is not ported (the sash module is a stub); only
// the window callbacks run.
PyObject* game=m_phaseWindows[5];
const int window=p.bWindow;
switch(p.subheader) {
case SASH_SUBHEADER_GC_OPEN: PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",1,window));break;
case SASH_SUBHEADER_GC_CLOSE: PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",2,window));break;
case SASH_SUBHEADER_GC_OPEN:
CPythonSash::Instance().Clear();
PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",1,window));
break;
case SASH_SUBHEADER_GC_CLOSE:
CPythonSash::Instance().Clear();
PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",2,window));
break;
case SASH_SUBHEADER_GC_ADDED:
if(p.bPos==1) PyCallClassMemberFunc(game,"AlertSash",Py_BuildValue("(b)",window));
CPythonSash::Instance().AddMaterial(p.dwPrice, p.bPos, p.tPos);
if(p.bPos==1) {
CPythonSash::Instance().AddResult(p.dwItemVnum, p.dwMinAbs, p.dwMaxAbs);
PyCallClassMemberFunc(game,"AlertSash",Py_BuildValue("(b)",window));
}
PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",3,window));
break;
case SASH_SUBHEADER_GC_REMOVED:
case SASH_SUBHEADER_CG_REFINED:
CPythonSash::Instance().RemoveMaterial(p.dwPrice, p.bPos);
if (p.bPos == 0)
CPythonSash::Instance().RemoveMaterial(p.dwPrice, 1);
PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",4,window));
break;
case SASH_SUBHEADER_CG_REFINED:
if (p.dwMaxAbs == 0)
CPythonSash::Instance().RemoveMaterial(p.dwPrice, 1);
else {
CPythonSash::Instance().RemoveMaterial(p.dwPrice, 0);
CPythonSash::Instance().RemoveMaterial(p.dwPrice, 1);
}
PyCallClassMemberFunc(game,"ActSash",Py_BuildValue("(ib)",5,window));
break;
default:
trace_error("CPythonNetworkStream::RecvSashPacket: unknown subheader "+std::to_string(p.subheader)+"\n.");
break;
+123 -3
View File
@@ -1,6 +1,7 @@
#include "ava2_text_file.h"
#include "ava2_text_file_loader.h"
#include "python_minimap.h"
#include "python_background.h"
#include "item_sound.h"
#include "item_proto.h"
#include "python_gameplay_modules.h"
@@ -946,6 +947,85 @@ void UseGuildSkill(int skillSlot) {
player_window_call("RunUseSkillEvent", Py_BuildValue("(if)", skillSlot, coolTime));
}
static bool s_isAtkKey = false;
static float s_fCmrRotSpd = 0.0f;
static uint32_t s_inGuildAreaID = 0xffffffff;
static bool IsMainActorFishingMode() {
const auto* pActor = player_main_actor();
if (pActor && pActor->m_dwMountVnum != 0) return false;
uint32_t weaponVnum = 0;
const auto equipWeapon = GetPlayerItemData(1, 184 /* EQUIPMENT_WEAPON */);
if (equipWeapon.vnum != 0) {
weaponVnum = equipWeapon.vnum;
} else if (pActor && pActor->m_dwWeapon != 0) {
weaponVnum = pActor->m_dwWeapon;
}
if (weaponVnum != 0) {
const auto* proto = s_itemProto.find(weaponVnum);
if (proto && proto->type == 13 /* ITEM_TYPE_ROD */) return true;
}
return false;
}
static bool IsMainActorFishing() {
const auto* pActor = player_main_actor();
return pActor && pActor->m_isFishing;
}
static bool NEW_CancelFishing() {
if (IsMainActorFishing()) {
static uint32_t s_dwLastCancelTime = 0;
uint32_t now = CTimer::Instance().GetCurrentMillisecond();
if (now < s_dwLastCancelTime + 500)
return false;
PythonNetworkStream::Instance().SendFishingPacket(0);
s_dwLastCancelTime = now;
return true;
}
return false;
}
static void NEW_Fishing() {
if (IsMainActorFishing()) {
PythonNetworkStream::Instance().SendFishingPacket(0);
} else {
if (IsMainActorFishingMode()) {
float curX = s_mainActorPos.x;
float curY = s_mainActorPos.y;
const auto* pActor = player_main_actor();
if (curX == 0.0f && curY == 0.0f && pActor) {
curX = float(pActor->m_lCurX);
curY = float(pActor->m_lCurY);
}
float charRot = pActor ? pActor->m_fRot : 0.0f;
int foundRot = -1;
const float c_fFishingDistance = 600.0f;
for (float fRot = 0.0f; fRot <= 180.0f; fRot += 10.0f) {
float radRight = (charRot + fRot) * 3.14159265358979323846f / 180.0f;
float rx = curX + c_fFishingDistance * sinf(radRight);
float ry = curY + c_fFishingDistance * cosf(radRight);
if (CPythonBackground::Instance().IsAttrOn(rx, ry, 2 /* ATTRIBUTE_WATER */)) {
foundRot = int(charRot + fRot);
break;
}
float radLeft = (charRot - fRot) * 3.14159265358979323846f / 180.0f;
float lx = curX + c_fFishingDistance * sinf(radLeft);
float ly = curY + c_fFishingDistance * cosf(radLeft);
if (CPythonBackground::Instance().IsAttrOn(lx, ly, 2 /* ATTRIBUTE_WATER */)) {
foundRot = int(charRot - fRot);
break;
}
}
if (foundRot >= 0) {
PythonNetworkStream::Instance().SendFishingPacket(foundRot);
} else {
player_window_call("OnFishingWrongPlace", Py_BuildValue("()"));
}
}
}
}
void ClickSkillSlot(int skillSlot) {
if (uint32_t(skillSlot) >= 255) return;
auto it = s_playerSkills.find(skillSlot);
@@ -961,6 +1041,16 @@ void ClickSkillSlot(int skillSlot) {
return;
}
// Special skill check (fishing)
if (skillIndex == 123 /* SKILL_INDEX_FISHING */ || skillIndex == 121) {
if (IsMainActorFishingMode()) {
NEW_Fishing();
} else {
player_window_call("OnCannotUseSkill", Py_BuildValue("(is)", PythonNetworkStream::Instance().GetMainActorVID(), "EQUIP_FISHING_ROD"));
}
return;
}
// Special skill check (combo)
if (skillIndex == 122 /* c_iSkillIndex_Combo */) {
if (it->second.level > 0) {
@@ -2334,6 +2424,8 @@ static PyObject* player_Clear(PyObject*, PyObject*) {
s_playerSkills.clear();
s_skillSlots.clear();
s_targetVID = 0;
s_inGuildAreaID = 0xffffffff;
s_isAtkKey = false;
PythonNetworkStream::Instance().SendTargetPacket(0);
return Py_BuildNone();
}
@@ -2354,6 +2446,7 @@ static PyObject* player_ComboAttack(PyObject*, PyObject*) {
}
static PyObject* player_EndKeyWalkingImmediately(PyObject*, PyObject*) {
NEW_CancelFishing();
return Py_BuildNone();
}
@@ -2459,8 +2552,9 @@ static PyObject* player_GetItemLink(PyObject*, PyObject* args) {
const std::string name = it != s_itemMap.end() ? it->second.name : "Item";
char itemlink[1024];
int len = snprintf(itemlink, sizeof(itemlink), "item:%x:%x", item.vnum, item.flags);
for (int i = 0; i < 6; ++i) len += snprintf(itemlink + len, sizeof(itemlink) - len, ":%x", item.alSockets[i]);
for (int i = 0; i < 7; ++i) len += snprintf(itemlink + len, sizeof(itemlink) - len, ":%x:%d", item.aAttr[i].bType, item.aAttr[i].sValue);
for (int i = 0; i < ITEM_SOCKET_SLOT_MAX_NUM; ++i) len += snprintf(itemlink + len, sizeof(itemlink) - len, ":%x", item.alSockets[i]);
for (int i = 0; i < ITEM_ATTRIBUTE_SLOT_MAX_NUM; ++i) len += snprintf(itemlink + len, sizeof(itemlink) - len, ":%x:%d", item.aAttr[i].bType, item.aAttr[i].sValue);
for (int i = 0; i < GLOVE_ATTR_MAX_NUM; ++i) len += snprintf(itemlink + len, sizeof(itemlink) - len, ":%x:%d", item.randomAttr[i].bType, item.randomAttr[i].sValue);
char buf[1024];
snprintf(buf, sizeof(buf), " |cffffc700|H%s|h[%s]|h|r", itemlink, name.c_str());
return Py_BuildValue("s", buf);
@@ -2474,7 +2568,7 @@ static PyObject* player_GetItemRandomAttribute(PyObject*, PyObject* args) {
if (!PyTuple_GetInteger(args, 0, &window) || !PyTuple_GetInteger(args, 1, &cell) || !PyTuple_GetInteger(args, 2, &attrSlot)) return Py_BuildException();
} else return Py_BuildException();
const auto item = GetPlayerItemData(window, cell);
if (attrSlot >= 0 && attrSlot < 15) {
if (attrSlot >= 0 && attrSlot < GLOVE_ATTR_MAX_NUM) {
return Py_BuildValue("ii", item.randomAttr[attrSlot].bType, item.randomAttr[attrSlot].sValue);
}
return Py_BuildValue("ii", 0, 0);
@@ -2732,12 +2826,20 @@ static PyObject* player_SendDragonSoulRefine(PyObject*, PyObject* args) {
static PyObject* player_SetAttackKeyState(PyObject*, PyObject* args) {
int pressed = 0;
if (!PyTuple_GetInteger(args, 0, &pressed)) return Py_BuildException();
if (pressed) {
if (IsMainActorFishingMode()) {
NEW_Fishing();
return Py_BuildNone();
}
}
s_isAtkKey = (pressed != 0);
return Py_BuildNone();
}
static PyObject* player_SetAutoCameraRotationSpeed(PyObject*, PyObject* args) {
float spd = 0.0f;
if (!PyTuple_GetFloat(args, 0, &spd)) return Py_BuildException();
s_fCmrRotSpd = spd;
return Py_BuildNone();
}
@@ -2826,6 +2928,8 @@ static PyObject* player_SetSingleDIKKeyState(PyObject*, PyObject* args) {
int dik = 0, pressed = 0;
if (!PyTuple_GetInteger(args, 0, &dik) || !PyTuple_GetInteger(args, 1, &pressed))
return Py_BuildException();
if (NEW_CancelFishing())
return Py_BuildNone();
return Py_BuildNone();
}
@@ -2845,6 +2949,22 @@ static PyObject* player_ToggleLevelLimit(PyObject*, PyObject*) {
}
static PyObject* player_Update(PyObject*, PyObject*) {
float curX = s_mainActorPos.x;
float curY = s_mainActorPos.y;
const auto* pActor = player_main_actor();
if (curX == 0.0f && curY == 0.0f && pActor) {
curX = float(pActor->m_lCurX);
curY = float(pActor->m_lCurY);
}
uint32_t dwAreaID = CPythonMiniMap::Instance().GetGuildAreaID(static_cast<uint32_t>(curX), static_cast<uint32_t>(curY));
if (dwAreaID != s_inGuildAreaID) {
if (dwAreaID != 0xffffffff) {
player_window_call("BINARY_Guild_EnterGuildArea", Py_BuildValue("(i)", dwAreaID));
} else {
player_window_call("BINARY_Guild_ExitGuildArea", Py_BuildValue("(i)", dwAreaID));
}
s_inGuildAreaID = dwAreaID;
}
return Py_BuildNone();
}
+28 -61
View File
@@ -24,6 +24,7 @@
#include "eter_net/PythonExchange.h"
#include "eter_net/PythonSafeBox.h"
#include "eter_net/PythonNetworkStream.h"
#include "python_sash.h"
#include <Python.h>
#include <string>
#include <vector>
@@ -1329,68 +1330,22 @@ void initskill() {
}
namespace {
class CPythonSash {
public:
static CPythonSash& Instance() {
static CPythonSash s;
return s;
}
uint32_t dwPrice = 0;
struct TSashMaterial {
uint8_t bHere = 0;
uint16_t wCell = 0;
};
struct TSashResult {
uint32_t dwItemVnum = 0;
uint32_t dwMinAbs = 0;
uint32_t dwMaxAbs = 0;
};
TSashResult m_vSashResult{};
std::vector<TSashMaterial> m_vSashMaterials;
CPythonSash() { Clear(); }
void Clear() {
dwPrice = 0;
m_vSashResult = {};
m_vSashMaterials.assign(2, TSashMaterial{0, 0});
}
void AddMaterial(uint32_t refPrice, uint8_t bPos, uint16_t cell) {
if (bPos >= 2) return;
if (bPos == 0) dwPrice = refPrice;
m_vSashMaterials[bPos] = TSashMaterial{1, cell};
}
void AddResult(uint32_t vnum, uint32_t minAbs, uint32_t maxAbs) {
m_vSashResult = {vnum, minAbs, maxAbs};
}
void RemoveMaterial(uint32_t refPrice, uint8_t bPos) {
if (bPos >= 2) return;
if (bPos == 1) dwPrice = refPrice;
m_vSashMaterials[bPos] = TSashMaterial{0, 0};
}
uint32_t GetPrice() const { return dwPrice; }
bool GetAttachedItem(uint8_t bPos, uint8_t& bHere, uint16_t& wCell) {
if (bPos >= m_vSashMaterials.size()) return false;
bHere = m_vSashMaterials[bPos].bHere;
wCell = m_vSashMaterials[bPos].wCell;
return true;
}
void GetResultItem(uint32_t& vnum, uint32_t& minAbs, uint32_t& maxAbs) {
vnum = m_vSashResult.dwItemVnum;
minAbs = m_vSashResult.dwMinAbs;
maxAbs = m_vSashResult.dwMaxAbs;
}
};
static PyObject* sash_SendCloseRequest(PyObject*, PyObject*) {
CPythonSash::Instance().Clear();
PythonNetworkStream::Instance().SendSashClosePacket();
return Py_BuildNone();
}
static PyObject* sash_Add(PyObject*, PyObject* args) {
int window = 0, cell = 0, pos = 0;
if (!PyTuple_GetInteger(args, 0, &window) || !PyTuple_GetInteger(args, 1, &cell) || !PyTuple_GetInteger(args, 2, &pos))
uint8_t bPos = 0;
TItemPos tPos;
int win = 0, cell = 0, pos = 0;
if (!PyTuple_GetInteger(args, 0, &win) || !PyTuple_GetInteger(args, 1, &cell) || !PyTuple_GetInteger(args, 2, &pos))
return Py_BuildException();
CPythonSash::Instance().AddMaterial(0, static_cast<uint8_t>(pos), static_cast<uint16_t>(cell));
tPos.window_type = static_cast<uint8_t>(win);
tPos.cell = static_cast<uint16_t>(cell);
bPos = static_cast<uint8_t>(pos);
PythonNetworkStream::Instance().SendSashAddPacket(tPos, bPos);
return Py_BuildNone();
}
@@ -1398,7 +1353,8 @@ static PyObject* sash_Remove(PyObject*, PyObject* args) {
int pos = 0;
if (!PyTuple_GetInteger(args, 0, &pos))
return Py_BuildException();
CPythonSash::Instance().RemoveMaterial(0, static_cast<uint8_t>(pos));
PythonNetworkStream::Instance().SendSashRemovePacket(static_cast<uint8_t>(pos));
return Py_BuildNone();
}
@@ -1410,19 +1366,30 @@ static PyObject* sash_GetAttachedItem(PyObject*, PyObject* args) {
int pos = 0;
if (!PyTuple_GetInteger(args, 0, &pos))
return Py_BuildException();
uint8_t bHere = 0;
uint16_t wCell = 0;
CPythonSash::Instance().GetAttachedItem(static_cast<uint8_t>(pos), bHere, wCell);
bool bGet = CPythonSash::Instance().GetAttachedItem(static_cast<uint8_t>(pos), bHere, wCell);
if (!bGet) {
bHere = 0;
wCell = 0;
}
return Py_BuildValue("ii", static_cast<int>(bHere), static_cast<int>(wCell));
}
static PyObject* sash_GetResultItem(PyObject*, PyObject*) {
uint32_t vnum = 0, minAbs = 0, maxAbs = 0;
CPythonSash::Instance().GetResultItem(vnum, minAbs, maxAbs);
return Py_BuildValue("iii", vnum, minAbs, maxAbs);
uint32_t dwItemVnum = 0, dwMinAbs = 0, dwMaxAbs = 0;
CPythonSash::Instance().GetResultItem(dwItemVnum, dwMinAbs, dwMaxAbs);
return Py_BuildValue("iii", dwItemVnum, dwMinAbs, dwMaxAbs);
}
static PyObject* sash_SendRefineRequest(PyObject*, PyObject*) {
uint8_t bHere = 0;
uint16_t wCell = 0;
bool bGet = CPythonSash::Instance().GetAttachedItem(1, bHere, wCell);
if (bGet && bHere) {
PythonNetworkStream::Instance().SendSashRefinePacket();
}
return Py_BuildNone();
}
+75
View File
@@ -0,0 +1,75 @@
#pragma once
#include "eter_base/Singleton.h"
#include "eter_net/Packet.h"
#include <vector>
namespace ava2 {
class CPythonSash : public CSingleton<CPythonSash> {
public:
uint32_t dwPrice = 0;
using TSashMaterials = std::vector<TSashMaterial>;
CPythonSash() { Clear(); }
virtual ~CPythonSash() = default;
static CPythonSash& Instance() {
CPythonSash* ptr = InstancePtr();
if (!ptr) {
static CPythonSash s;
return s;
}
return *ptr;
}
void Clear() {
dwPrice = 0;
m_vSashResult = {};
m_vSashMaterials.assign(SASH_WINDOW_MAX_MATERIALS, TSashMaterial{0, 0});
}
void AddMaterial(uint32_t dwRefPrice, uint8_t bPos, TItemPos tPos) {
if (bPos >= SASH_WINDOW_MAX_MATERIALS)
return;
if (bPos == 0)
dwPrice = dwRefPrice;
m_vSashMaterials[bPos] = TSashMaterial{1, tPos.cell};
}
void AddResult(uint32_t dwItemVnum, uint32_t dwMinAbs, uint32_t dwMaxAbs) {
m_vSashResult = {dwItemVnum, dwMinAbs, dwMaxAbs};
}
void RemoveMaterial(uint32_t dwRefPrice, uint8_t bPos) {
if (bPos >= SASH_WINDOW_MAX_MATERIALS)
return;
if (bPos == 1)
dwPrice = dwRefPrice;
m_vSashMaterials[bPos] = TSashMaterial{0, 0};
}
uint32_t GetPrice() const { return dwPrice; }
bool GetAttachedItem(uint8_t bPos, uint8_t& bHere, uint16_t& wCell) {
if (bPos >= m_vSashMaterials.size())
return false;
bHere = m_vSashMaterials[bPos].bHere;
wCell = m_vSashMaterials[bPos].wCell;
return true;
}
void GetResultItem(uint32_t& dwItemVnum, uint32_t& dwMinAbs, uint32_t& dwMaxAbs) {
dwItemVnum = m_vSashResult.dwItemVnum;
dwMinAbs = m_vSashResult.dwMinAbs;
dwMaxAbs = m_vSashResult.dwMaxAbs;
}
protected:
TSashResult m_vSashResult{};
TSashMaterials m_vSashMaterials;
};
} // namespace ava2
using ava2::CPythonSash;
+1 -1
View File
@@ -21,7 +21,7 @@ for body in re.findall(r'\benum\s*\w*\s*\{(.*?)\}',processed,re.S):
aliases={'HEADER_CG_CHARACTER_CREATE':'HEADER_CG_PLAYER_CREATE','HEADER_CG_CHARACTER_DELETE':'HEADER_CG_PLAYER_DESTROY','HEADER_CG_MOVE':'HEADER_CG_CHARACTER_MOVE','HEADER_CG_CHARACTER_SELECT':'HEADER_CG_PLAYER_SELECT','HEADER_GC_CHARACTER_CREATE_SUCCESS':'HEADER_GC_PLAYER_CREATE_SUCCESS','HEADER_GC_CHARACTER_CREATE_FAILURE':'HEADER_GC_PLAYER_CREATE_FAILURE','HEADER_GC_CHARACTER_DELETE_SUCCESS':'HEADER_GC_PLAYER_DELETE_SUCCESS','PHASE_OFFLINE':'PHASE_CLOSE'}
port=(root/'src/eter_net/Packet.h').read_text()
checked=[];mismatches=[];unmatched=[]
for name,value in re.findall(r'\b((?:HEADER_[CG][GC]_|PHASE_|EXCHANGE_SUBHEADER_|MESSENGER_SUBHEADER_CG_|GUILD_SUBHEADER_CG_)[A-Z0-9_]+)\s*=\s*(0x[0-9a-fA-F]+|\d+)',port):
for name,value in re.findall(r'\b((?:HEADER_[CG][GC]_|PHASE_|EXCHANGE_SUBHEADER_|MESSENGER_SUBHEADER_|GUILD_SUBHEADER_|FISHING_SUBHEADER_|DUNGEON_SUBHEADER_|SASH_SUBHEADER_|KINGDOMSWAR_SUBHEADER_|SHOP_SUBHEADER_|DS_SUB_HEADER_)[A-Z0-9_]+)\s*=\s*(0x[0-9a-fA-F]+|\d+)',port):
reference=aliases.get(name,name)
if reference not in values: unmatched.append(name);continue
row={'name':name,'windows_name':reference,'windows':values[reference],'port':int(value,0)}