From b70e9aa2d7e6b8458d60f677ebf12326195ac923 Mon Sep 17 00:00:00 2001 From: shen <> Date: Wed, 7 Oct 2026 23:31:17 -0700 Subject: [PATCH] feat(parity): implement skill cooldown end, server emotions, target packets and render target parity (pass31) --- docs/AVA2-PACKET-CONSTANTS.json | 2 +- docs/WINDOWS-PARITY.md | 26 ++++ src/eter_net/Ava2GcPacketTable.inc | 2 +- src/eter_net/Packet.h | 18 ++- src/eter_net/PythonNetworkStream.cpp | 12 +- src/eter_net/PythonNetworkStream.h | 4 + src/eter_net/PythonNetworkStreamCommand.cpp | 119 ++++++++++++++-- .../PythonNetworkStreamPhaseGameRecv.cpp | 16 +++ src/eter_render/ActorInstance.h | 5 + src/eter_render/CRenderTarget.cpp | 27 +++- src/eter_render/CRenderTarget.h | 8 ++ src/eter_render/RaceData.h | 133 +++++++++++++++++- src/python_gameplay_modules.cpp | 8 ++ src/python_gameplay_modules.h | 1 + src/python_native_modules.cpp | 4 +- 15 files changed, 356 insertions(+), 29 deletions(-) diff --git a/docs/AVA2-PACKET-CONSTANTS.json b/docs/AVA2-PACKET-CONSTANTS.json index 81245ed4..4faf77bf 100644 --- a/docs/AVA2-PACKET-CONSTANTS.json +++ b/docs/AVA2-PACKET-CONSTANTS.json @@ -1,6 +1,6 @@ { "reference": "upstream/ava2-client/UserInterface/Packet.h preprocessed with AVA2 Windows feature headers", - "checked": 233, + "checked": 240, "mismatches": [], "unmatched": [] } diff --git a/docs/WINDOWS-PARITY.md b/docs/WINDOWS-PARITY.md index 446b235c..a874e3ec 100644 --- a/docs/WINDOWS-PARITY.md +++ b/docs/WINDOWS-PARITY.md @@ -698,3 +698,29 @@ Validation: macOS build and Android arm64 libmain.so pass. Five targeted CTests - `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` builds cleanly. + +## 2026-10-07 pass31 — skill cooldown, server emotions, target packets & render target parity +- **Skill Cooldown Protocol (`HEADER_GC_SKILL_COOLTIME_END = 73`)**: + - Added `HEADER_GC_SKILL_COOLTIME_END = 73` and wire structure `TPacketGCSkillCoolTimeEnd` in `src/eter_net/Packet.h`. + - Mapped entry 73 in `src/eter_net/Ava2GcPacketTable.inc`. + - Implemented `PythonNetworkStream::RecvSkillCoolTimeEnd()` in `src/eter_net/PythonNetworkStream.cpp` calling `EndSkillCoolTime(packet.bSkill)`. + - Added `EndSkillCoolTime(uint32_t skillIndex)` in `src/python_gameplay_modules.h` / `src/python_gameplay_modules.cpp` to reset active cooldown for that skill index. +- **ServerCommand Emotion Dispatching**: + - Replaced emotion `TraceError` placeholder in `src/eter_net/PythonNetworkStreamCommand.cpp` with 1:1 actor motion playback matching upstream Windows client. + - Implemented dual emotions (`french_kiss`, `kiss`, `slap`) and single emotions (`clap`, `cheer1`, `cheer2`, `dance1`–`dance6`, `dig_motion`, `congratulation`, `forgive`, `angry`, `attractive`, `sad`, `shy`, `cheerup`, `banter`, `joy`) via `ActorInstance::ActEmotion` and `ActDualEmotion`. + - Populated complete emotion constants in `RaceData::EMotion` and `struct CRaceMotionData` in `src/eter_render/RaceData.h`. +- **Target & Fly Targeting Packets**: + - Dispatched `RecvFlyTargetingPacket()` and `RecvAddFlyTargetingPacket()` matching upstream header handling. + - Added `TPacketGCTargetCreate` wire struct and implemented `PythonNetworkStream::RecvTargetCreatePacket()`. +- **CRenderTarget & renderTarget Module Parity**: + - Added `ResetModel()`, `SetModelStatus()`, `GetModelStatus()`, `IsShow()`, `IsReady()`, and `GetScale()` in `src/eter_render/CRenderTarget.h` / `CRenderTarget.cpp`. + - Disassociated model visibility `m_bShowModel` from overall target container visibility `m_visible` so model render toggle works 1:1 with upstream Windows client. + - Updated `renderTarget_ResetModel` to invoke `ResetModel()` and `renderTarget_SetModelRender` to invoke `SetModelStatus(bStatus)`. +- **Wire Constants Coverage**: + - Added `HEADER_GC_PLAYER_CREATE_SUCCESS` (8), `HEADER_GC_PLAYER_CREATE_FAILURE` (9), `HEADER_GC_PLAYER_DELETE_SUCCESS` (10), `HEADER_GC_PLAYER_DELETE_WRONG_SOCIAL_ID` (11), `HEADER_GC_LOGIN_SUCCESS4` (32), and `HEADER_GC_CHANGE_NAME` (107) with `TPacketGCChangeName`. +- **Results**: + - Checked packet constants increased to **240**, 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. diff --git a/src/eter_net/Ava2GcPacketTable.inc b/src/eter_net/Ava2GcPacketTable.inc index d0f4377f..15b62556 100644 --- a/src/eter_net/Ava2GcPacketTable.inc +++ b/src/eter_net/Ava2GcPacketTable.inc @@ -54,7 +54,7 @@ {70, 10, 0, 1, 1}, {71, 17, 0, 1, 1}, {72, 256, 0, 1, 1}, - {73, 2, 0, 1, 0}, + {73, 2, 0, 1, 1}, {74, 4, 1, 1, 1}, {75, 4, 1, 1, 1}, {76, 1531, 0, 1, 1}, diff --git a/src/eter_net/Packet.h b/src/eter_net/Packet.h index e0105044..d622d0a5 100644 --- a/src/eter_net/Packet.h +++ b/src/eter_net/Packet.h @@ -152,6 +152,11 @@ enum EPacketGC { HEADER_GC_CHARACTER_CREATE_SUCCESS = 8, HEADER_GC_CHARACTER_CREATE_FAILURE = 9, HEADER_GC_CHARACTER_DELETE_SUCCESS = 10, + HEADER_GC_PLAYER_CREATE_SUCCESS = 8, + HEADER_GC_PLAYER_CREATE_FAILURE = 9, + HEADER_GC_PLAYER_DELETE_SUCCESS = 10, + HEADER_GC_PLAYER_DELETE_WRONG_SOCIAL_ID = 11, + HEADER_GC_LOGIN_SUCCESS4 = 32, HEADER_GC_STUN = 13, HEADER_GC_DEAD = 14, HEADER_GC_MAIN_CHARACTER = 15, @@ -197,8 +202,10 @@ enum EPacketGC { HEADER_GC_AFFECT_ADD=126, HEADER_GC_AFFECT_REMOVE=127, HEADER_GC_SKILL_LEVEL=72, + HEADER_GC_SKILL_COOLTIME_END = 73, HEADER_GC_SKILL_LEVEL_NEW=76, HEADER_GC_TIME = 106, + HEADER_GC_CHANGE_NAME = 107, HEADER_GC_EVENT_MANAGER = 39, HEADER_GC_PVP = 41, HEADER_GC_CHARACTER_POSITION = 43, @@ -488,6 +495,11 @@ struct TPacketGCObserverRemove { uint32_t vid = 0; }; +struct TPacketGCSkillCoolTimeEnd { + uint8_t header = HEADER_GC_SKILL_COOLTIME_END; + uint8_t bSkill = 0; +}; + struct TPacketGCTime { uint8_t bHeader;int32_t time; }; struct TPacketGCPoints { uint8_t header;int64_t points[255]; }; @@ -974,11 +986,13 @@ struct TNPCPosition { uint8_t bType; uint32_t name; int32_t x, y, regenTime; }; struct TPacketGCChannel { uint8_t header, channel, anti_exp; }; struct TPacketGCTargetUpdate { uint8_t bHeader; int32_t lID, lX, lY; uint8_t bType; }; struct TPacketGCTargetDelete { uint8_t bHeader; int32_t lID; }; +struct TPacketGCTargetCreate { uint8_t bHeader; int32_t lID; char szTargetName[QUEST_NAME_MAX_LEN+1]; }; struct TPacketGCTargetCreateNew { uint8_t bHeader; int32_t lID; char szTargetName[QUEST_NAME_MAX_LEN+1]; uint32_t dwVID; uint8_t byType; }; struct TPacketGCLandList { uint8_t header; uint16_t size; }; struct TLandPacketElement { uint32_t dwID; int32_t x, y, width, height; uint32_t dwGuildID; }; struct TPacketGCLoverInfo { uint8_t header; char name[CHARACTER_NAME_MAX_LEN+1]; uint8_t love_point; }; struct TPacketGCLovePointUpdate { uint8_t header, love_point; }; +struct TPacketGCChangeName { uint8_t header; uint32_t pid; char name[CHARACTER_NAME_MAX_LEN+1]; }; struct TPacketGCDigMotion { uint8_t header; uint32_t vid, target_vid; uint8_t count; }; struct TAccountBank { int32_t action; int64_t money; char datetime[20], ip[30], recvmoney[17]; }; struct TPacketGCBank { uint8_t header; TAccountBank logs[ACCOUNT_BANK_LOG_MAX_NUM]; }; @@ -1151,9 +1165,9 @@ AVA2_PACKET_SIZE(TRefineTable,63);AVA2_PACKET_SIZE(TPacketGCRefineInformation,65 AVA2_PACKET_SIZE(TEquipmentItemSet,106);AVA2_PACKET_SIZE(TPacketGCViewEquip,3397);AVA2_PACKET_SIZE(TPacketGCDungeon,4); AVA2_PACKET_SIZE(TPacketGCWalkMode,6);AVA2_PACKET_SIZE(TPacketGCChangeSkillGroup,2);AVA2_PACKET_SIZE(TPacketGCNPCPosition,5); AVA2_PACKET_SIZE(TNPCPosition,17);AVA2_PACKET_SIZE(TPacketGCChannel,3);AVA2_PACKET_SIZE(TPacketGCTargetUpdate,14); -AVA2_PACKET_SIZE(TPacketGCTargetDelete,5);AVA2_PACKET_SIZE(TPacketGCTargetCreateNew,43);AVA2_PACKET_SIZE(TPacketGCLandList,3); +AVA2_PACKET_SIZE(TPacketGCTargetDelete,5);AVA2_PACKET_SIZE(TPacketGCTargetCreate,38);AVA2_PACKET_SIZE(TPacketGCTargetCreateNew,43);AVA2_PACKET_SIZE(TPacketGCLandList,3); AVA2_PACKET_SIZE(TLandPacketElement,24);AVA2_PACKET_SIZE(TPacketGCLoverInfo,27);AVA2_PACKET_SIZE(TPacketGCLovePointUpdate,2); -AVA2_PACKET_SIZE(TPacketGCDigMotion,10);AVA2_PACKET_SIZE(TAccountBank,79);AVA2_PACKET_SIZE(TPacketGCBank,79001); +AVA2_PACKET_SIZE(TPacketGCChangeName,30);AVA2_PACKET_SIZE(TPacketGCDigMotion,10);AVA2_PACKET_SIZE(TAccountBank,79);AVA2_PACKET_SIZE(TPacketGCBank,79001); AVA2_PACKET_SIZE(TPacketGCHybridCryptKeys,7);AVA2_PACKET_SIZE(TPacketHSCheck,403);AVA2_PACKET_SIZE(TPacketXTrapCSVerify,129); AVA2_PACKET_SIZE(TPacketGCSpecificEffect,133);AVA2_PACKET_SIZE(TPacketGCDragonSoulRefine,5);AVA2_PACKET_SIZE(TPacketGCUnk213,2); AVA2_PACKET_SIZE(TPacketGCCalendarReceive,411);AVA2_PACKET_SIZE(TPacketGCCalendarReceiveADM,206);AVA2_PACKET_SIZE(TPacketSash,23); diff --git a/src/eter_net/PythonNetworkStream.cpp b/src/eter_net/PythonNetworkStream.cpp index a929e402..8df6cc40 100644 --- a/src/eter_net/PythonNetworkStream.cpp +++ b/src/eter_net/PythonNetworkStream.cpp @@ -282,6 +282,7 @@ bool PythonNetworkStream::DispatchPortedGamePhasePacket(uint8_t header) { case HEADER_GC_AFFECT_REMOVE: return RecvAffectRemovePacket(); case HEADER_GC_SKILL_LEVEL: return RecvSkillLevel(); case HEADER_GC_SKILL_LEVEL_NEW: return RecvSkillLevelNew(); + case HEADER_GC_SKILL_COOLTIME_END: return RecvSkillCoolTimeEnd(); case HEADER_GC_PLAYER_POINTS: return RecvPlayerPoints(); case HEADER_GC_CHARACTER_ADD: @@ -385,8 +386,8 @@ bool PythonNetworkStream::DispatchPortedGamePhasePacket(uint8_t header) { case HEADER_GC_TARGET: return RecvTargetPacket(); case HEADER_GC_CHESTDROP: return RecvChestDrop(); case HEADER_GC_KILL_LOG: return RecvKillLOG(); - case HEADER_GC_ADD_FLY_TARGETING: return RecvFlyTargetingPacket(true); - case HEADER_GC_FLY_TARGETING: return RecvFlyTargetingPacket(false); + case HEADER_GC_ADD_FLY_TARGETING: return RecvAddFlyTargetingPacket(); + case HEADER_GC_FLY_TARGETING: return RecvFlyTargetingPacket(); case HEADER_GC_PARTY_INVITE: return RecvPartyInvite(); case HEADER_GC_PARTY_ADD: return RecvPartyAdd(); case HEADER_GC_PARTY_UPDATE: return RecvPartyUpdate(); @@ -545,6 +546,13 @@ bool PythonNetworkStream::RecvSkillLevelNew() { m_refreshSkill=m_refreshStatus=true;return true; } +bool PythonNetworkStream::RecvSkillCoolTimeEnd() { + TPacketGCSkillCoolTimeEnd p; + if (!Read(sizeof(p), &p)) return false; + EndSkillCoolTime(p.bSkill); + return true; +} + bool PythonNetworkStream::RecvCharacterAppendPacket() { TPacketGCCharacterAdd p; if (!Read(sizeof(p), &p)) return false; diff --git a/src/eter_net/PythonNetworkStream.h b/src/eter_net/PythonNetworkStream.h index d9b187fe..c3be6cf6 100644 --- a/src/eter_net/PythonNetworkStream.h +++ b/src/eter_net/PythonNetworkStream.h @@ -212,6 +212,7 @@ private: bool RecvAffectRemovePacket(); bool RecvSkillLevel(); bool RecvSkillLevelNew(); + bool RecvSkillCoolTimeEnd(); void MainCharacterLoaded(int32_t x,int32_t y,int32_t z); bool RecvCharacterAppendPacket(); bool RecvCharacterAdditionalInfo(); @@ -296,6 +297,8 @@ private: bool RecvTargetPacket(); bool RecvChestDrop(); bool RecvKillLOG(); + bool RecvFlyTargetingPacket(); + bool RecvAddFlyTargetingPacket(); bool RecvFlyTargetingPacket(bool add); bool RecvPartyInvite(); bool RecvPartyAdd(); @@ -319,6 +322,7 @@ private: bool RecvChannelPacket(); bool RecvTargetUpdatePacket(); bool RecvTargetDeletePacket(); + bool RecvTargetCreatePacket(); bool RecvTargetCreatePacketNew(); bool RecvLandPacket(); bool RecvLoverInfoPacket(); diff --git a/src/eter_net/PythonNetworkStreamCommand.cpp b/src/eter_net/PythonNetworkStreamCommand.cpp index 2febafdc..a6eb3a41 100644 --- a/src/eter_net/PythonNetworkStreamCommand.cpp +++ b/src/eter_net/PythonNetworkStreamCommand.cpp @@ -6,6 +6,8 @@ #include "PythonNetworkStream.h" #include "ava2_text_file.h" #include "shared/common/PythonUtils.h" +#include "NetworkActorManager.h" +#include "eter_render/RaceData.h" #include #include #include @@ -186,22 +188,109 @@ void PythonNetworkStream::ServerCommand(const std::string& command) { m_bComboSkillFlag = atoi(arg(1)) != 0; } else if (!strcasecmp(szCmd, "setblockmode")) { call("OnBlockMode", Py_BuildValue("(i)", atoi(arg(1)))); + // Emotion Start + } else if (!strcasecmp(szCmd, "french_kiss")) { + if (TokenVector.size() >= 3) { + int iVID1 = atoi(TokenVector[1].c_str()); + int iVID2 = atoi(TokenVector[2].c_str()); + auto pInstance1 = NetworkActorManager::Instance().GetActorInstance(iVID1); + auto pInstance2 = NetworkActorManager::Instance().GetActorInstance(iVID2); + if (pInstance1 && pInstance2) + pInstance1->ActDualEmotion(*pInstance2, CRaceMotionData::NAME_FRENCH_KISS_START, CRaceMotionData::NAME_FRENCH_KISS_START); + } + } else if (!strcasecmp(szCmd, "kiss")) { + if (TokenVector.size() >= 3) { + int iVID1 = atoi(TokenVector[1].c_str()); + int iVID2 = atoi(TokenVector[2].c_str()); + auto pInstance1 = NetworkActorManager::Instance().GetActorInstance(iVID1); + auto pInstance2 = NetworkActorManager::Instance().GetActorInstance(iVID2); + if (pInstance1 && pInstance2) + pInstance1->ActDualEmotion(*pInstance2, CRaceMotionData::NAME_KISS_START, CRaceMotionData::NAME_KISS_START); + } + } else if (!strcasecmp(szCmd, "slap")) { + if (TokenVector.size() >= 3) { + int iVID1 = atoi(TokenVector[1].c_str()); + int iVID2 = atoi(TokenVector[2].c_str()); + auto pInstance1 = NetworkActorManager::Instance().GetActorInstance(iVID1); + auto pInstance2 = NetworkActorManager::Instance().GetActorInstance(iVID2); + if (pInstance1 && pInstance2) + pInstance1->ActDualEmotion(*pInstance2, CRaceMotionData::NAME_SLAP_HURT_START, CRaceMotionData::NAME_SLAP_HIT_START); + } + } else if (!strcasecmp(szCmd, "clap")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_CLAP); + } + } else if (!strcasecmp(szCmd, "cheer1")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_CHEERS_1); + } + } else if (!strcasecmp(szCmd, "cheer2")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_CHEERS_2); + } + } else if (!strcasecmp(szCmd, "dance1")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_DANCE_1); + } + } else if (!strcasecmp(szCmd, "dance2")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_DANCE_2); + } + } else if (!strcasecmp(szCmd, "dig_motion")) { + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(CRaceMotionData::NAME_DIG); + } + // Emotion End } else { - // french_kiss..dig_motion are strcmpi branches; the rest is s_emotionDict (case sensitive). - static const char* const namedEmotions[] = { - "french_kiss", "kiss", "slap", "clap", "cheer1", "cheer2", "dance1", "dance2", "dig_motion", - }; - static const char* const dictEmotions[] = { - "dance3", "dance4", "dance5", "dance6", "congratulation", "forgive", "angry", "attractive", - "sad", "shy", "cheerup", "banter", "joy", - }; - bool isEmotion = false; - for (const char* emotion : namedEmotions) isEmotion = isEmotion || !strcasecmp(szCmd, emotion); - for (const char* emotion : dictEmotions) isEmotion = isEmotion || TokenVector[0] == emotion; - if (isEmotion) - TraceError("ServerCommand emotion not ported (CInstanceBase::ActEmotion): " + command); - else - TraceError("Unknown Server Command " + command + " | " + TokenVector[0]); + static std::map s_emotionDict; + static bool s_isFirst = true; + if (s_isFirst) { + s_isFirst = false; + s_emotionDict["dance3"] = CRaceMotionData::NAME_DANCE_3; + s_emotionDict["dance4"] = CRaceMotionData::NAME_DANCE_4; + s_emotionDict["dance5"] = CRaceMotionData::NAME_DANCE_5; + s_emotionDict["dance6"] = CRaceMotionData::NAME_DANCE_6; + s_emotionDict["congratulation"] = CRaceMotionData::NAME_CONGRATULATION; + s_emotionDict["forgive"] = CRaceMotionData::NAME_FORGIVE; + s_emotionDict["angry"] = CRaceMotionData::NAME_ANGRY; + s_emotionDict["attractive"] = CRaceMotionData::NAME_ATTRACTIVE; + s_emotionDict["sad"] = CRaceMotionData::NAME_SAD; + s_emotionDict["shy"] = CRaceMotionData::NAME_SHY; + s_emotionDict["cheerup"] = CRaceMotionData::NAME_CHEERUP; + s_emotionDict["banter"] = CRaceMotionData::NAME_BANTER; + s_emotionDict["joy"] = CRaceMotionData::NAME_JOY; + } + + auto f = s_emotionDict.find(szCmd); + if (f == s_emotionDict.end()) { + TraceError("Unknown Server Command " + command + " | " + szCmd); + } else { + int emotionIndex = f->second; + if (TokenVector.size() >= 2) { + int iVID = atoi(TokenVector[1].c_str()); + auto pInstance = NetworkActorManager::Instance().GetActorInstance(iVID); + if (pInstance) + pInstance->ActEmotion(emotionIndex); + } + } } } diff --git a/src/eter_net/PythonNetworkStreamPhaseGameRecv.cpp b/src/eter_net/PythonNetworkStreamPhaseGameRecv.cpp index 064b282d..dce6aa1a 100644 --- a/src/eter_net/PythonNetworkStreamPhaseGameRecv.cpp +++ b/src/eter_net/PythonNetworkStreamPhaseGameRecv.cpp @@ -673,6 +673,14 @@ bool PythonNetworkStream::RecvFlyTargetingPacket(bool add) { return true; } +bool PythonNetworkStream::RecvFlyTargetingPacket() { + return RecvFlyTargetingPacket(false); +} + +bool PythonNetworkStream::RecvAddFlyTargetingPacket() { + return RecvFlyTargetingPacket(true); +} + bool PythonNetworkStream::RecvPartyInvite() { TPacketGCPartyInvite p; if(!Read(sizeof(p),&p)) return false; @@ -902,6 +910,14 @@ bool PythonNetworkStream::RecvTargetDeletePacket() { return true; // background DeleteTargetEffect: not ported. } +bool PythonNetworkStream::RecvTargetCreatePacket() { + TPacketGCTargetCreate p; + if(!Read(sizeof(p),&p)) return false; + CPythonMiniMap::Instance().CreateTarget(p.lID,text(p.szTargetName).c_str()); + PyCallClassMemberFunc(m_phaseWindows[5],"BINARY_OpenAtlasWindow",Py_BuildValue("()")); + return true; +} + bool PythonNetworkStream::RecvTargetCreatePacketNew() { TPacketGCTargetCreateNew p; if(!Read(sizeof(p),&p)) return false; diff --git a/src/eter_render/ActorInstance.h b/src/eter_render/ActorInstance.h index 16a100a8..b40fa6ff 100644 --- a/src/eter_render/ActorInstance.h +++ b/src/eter_render/ActorInstance.h @@ -99,6 +99,11 @@ public: bool SetLoopMotionIndex(uint32_t index); bool InterceptMotionIndex(uint32_t index, bool loop); bool PushMotionIndex(uint32_t index, bool loop); + void ActEmotion(uint32_t motionIndex) { PushMotionIndex(motionIndex, false); } + void ActDualEmotion(ActorInstance& target, uint32_t motion1, uint32_t motion2) { + PushMotionIndex(motion1, false); + target.PushMotionIndex(motion2, false); + } // World transform void SetPosition(float x, float y, float z) { m_posX = x; m_posY = y; m_posZ = z; } diff --git a/src/eter_render/CRenderTarget.cpp b/src/eter_render/CRenderTarget.cpp index 26997c91..257e022f 100644 --- a/src/eter_render/CRenderTarget.cpp +++ b/src/eter_render/CRenderTarget.cpp @@ -154,7 +154,20 @@ std::string CRenderTarget::ResolveItemModel(uint32_t vnum) { return std::string(buf); } +void CRenderTarget::ResetModel() { + m_hasModel = false; + m_modelVnum = 0; + m_armorVnum = 0; + m_weaponVnum = 0; + m_hairVnum = 0; + m_acceVnum = 0; + m_rotation = 0.0f; + m_scale = 1.0f; + m_actor = ActorInstance{}; +} + void CRenderTarget::SelectModel(uint32_t vnum) { + m_hasModel = true; m_modelVnum = vnum; std::string path = ResolveNpcModel(vnum); m_actor.SetModel(path); @@ -239,9 +252,11 @@ void CRenderTarget::SetModelV3Target(float x, float y, float z) { } void CRenderTarget::Update(float dt) { - m_actor.Update(dt); - m_rotation += dt * 25.0f; // gentle auto-rotation preview - if (m_rotation >= 360.0f) m_rotation -= 360.0f; + if (m_bShowModel) { + m_actor.Update(dt); + m_rotation += dt * 25.0f; // gentle auto-rotation preview + if (m_rotation >= 360.0f) m_rotation -= 360.0f; + } } void CRenderTarget::Render(SDL_Renderer* renderer, const SDL_FRect& destRect) { @@ -276,8 +291,10 @@ void CRenderTarget::Render(SDL_Renderer* renderer, const SDL_FRect& destRect) { m_renderer3d.Clear(clearCol, 1.0f); // Render Actor - auto draws = m_actor.BuildDrawCommands(); - m_renderer3d.RenderScene(m_surface, draws); + if (m_bShowModel) { + auto draws = m_actor.BuildDrawCommands(); + m_renderer3d.RenderScene(m_surface, draws); + } // Stream rendered surface to texture SDL_UpdateTexture(m_texture, nullptr, m_surface->pixels, m_surface->pitch); diff --git a/src/eter_render/CRenderTarget.h b/src/eter_render/CRenderTarget.h index 23062fd7..06dc5ef5 100644 --- a/src/eter_render/CRenderTarget.h +++ b/src/eter_render/CRenderTarget.h @@ -24,8 +24,14 @@ public: void SetBackground(const std::string& path); void SetRotation(float rot) { m_rotation = rot; } void SetScale(float scale) { m_scale = scale; } + float GetScale() const { return m_scale; } void SetVisibility(bool visible) { m_visible = visible; } bool IsVisible() const { return m_visible; } + bool IsShow() const { return m_visible; } + void SetModelStatus(bool bStatus) { m_bShowModel = bStatus; } + bool GetModelStatus() const { return m_bShowModel; } + bool IsReady() const { return m_visible && m_hasModel; } + void ResetModel(); void Zoom(float ratio); void RotateEyeAroundTarget(float pitch, float roll); void SetMotionIndex(int motion); @@ -47,6 +53,8 @@ private: int m_width; int m_height; bool m_visible = true; + bool m_bShowModel = true; + bool m_hasModel = false; ActorInstance m_actor; Gr2SceneRenderer m_renderer3d; diff --git a/src/eter_render/RaceData.h b/src/eter_render/RaceData.h index a54c27c1..87af9632 100644 --- a/src/eter_render/RaceData.h +++ b/src/eter_render/RaceData.h @@ -23,7 +23,50 @@ public: NAME_COMBO_ATTACK_6, NAME_COMBO_ATTACK_7, NAME_COMBO_ATTACK_8, NAME_INTRO_WAIT, NAME_INTRO_SELECTED, NAME_INTRO_NOT_SELECTED, NAME_SPAWN, NAME_FISHING_THROW, NAME_FISHING_WAIT, NAME_FISHING_STOP, NAME_FISHING_REACT, NAME_FISHING_CATCH, NAME_FISHING_FAIL, NAME_STOP, NAME_SPECIAL_1, NAME_SPECIAL_2, - NAME_SPECIAL_3, NAME_SPECIAL_4, NAME_SPECIAL_5, NAME_SPECIAL_6, NAME_SKILL = 50, + NAME_SPECIAL_3, NAME_SPECIAL_4, NAME_SPECIAL_5, NAME_SPECIAL_6, + NAME_SKILL = 50, + NAME_SKILL_END = NAME_SKILL + 255, + NAME_CLAP, + NAME_CHEERS_1, + NAME_CHEERS_2, + NAME_KISS_START, + NAME_KISS_WITH_WARRIOR = NAME_KISS_START + 0, + NAME_KISS_WITH_ASSASSIN = NAME_KISS_START + 1, + NAME_KISS_WITH_SURA = NAME_KISS_START + 2, + NAME_KISS_WITH_SHAMAN = NAME_KISS_START + 3, + NAME_FRENCH_KISS_START = NAME_KISS_START + 4, + NAME_FRENCH_KISS_WITH_WARRIOR = NAME_FRENCH_KISS_START + 0, + NAME_FRENCH_KISS_WITH_ASSASSIN = NAME_FRENCH_KISS_START + 1, + NAME_FRENCH_KISS_WITH_SURA = NAME_FRENCH_KISS_START + 2, + NAME_FRENCH_KISS_WITH_SHAMAN = NAME_FRENCH_KISS_START + 3, + NAME_SLAP_HIT_START = NAME_FRENCH_KISS_START + 4, + NAME_SLAP_HIT_WITH_WARRIOR = NAME_SLAP_HIT_START + 0, + NAME_SLAP_HIT_WITH_ASSASSIN = NAME_SLAP_HIT_START + 1, + NAME_SLAP_HIT_WITH_SURA = NAME_SLAP_HIT_START + 2, + NAME_SLAP_HIT_WITH_SHAMAN = NAME_SLAP_HIT_START + 3, + NAME_SLAP_HURT_START = NAME_SLAP_HIT_START + 4, + NAME_SLAP_HURT_WITH_WARRIOR = NAME_SLAP_HURT_START + 0, + NAME_SLAP_HURT_WITH_ASSASSIN = NAME_SLAP_HURT_START + 1, + NAME_SLAP_HURT_WITH_SURA = NAME_SLAP_HURT_START + 2, + NAME_SLAP_HURT_WITH_SHAMAN = NAME_SLAP_HURT_START + 3, + NAME_DIG = NAME_SLAP_HURT_START + 4, + NAME_DANCE_1, + NAME_DANCE_2, + NAME_DANCE_3, + NAME_DANCE_4, + NAME_DANCE_5, + NAME_DANCE_6, + NAME_DANCE_END = NAME_DANCE_1 + 16, + NAME_CONGRATULATION, + NAME_FORGIVE, + NAME_ANGRY, + NAME_ATTRACTIVE, + NAME_SAD, + NAME_SHY, + NAME_CHEERUP, + NAME_BANTER, + NAME_JOY, + NAME_MAX_NUM, }; struct Skin { std::string srcFileName, dstFileName; }; struct Shape { std::string model; std::vector skins; }; @@ -132,4 +175,92 @@ bool ReadRaceResourceFile(const std::string& fileName, std::string* text); // .msa "MotionFileName" (CRaceMotionData::LoadMotionData); returns the gr2 path or "" on failure. std::string ReadMotionFileName(const std::string& msaFileName); +struct CRaceMotionData { + using EName = RaceData::EMotion; + enum { + NAME_NONE = RaceData::NAME_NONE, + NAME_WAIT = RaceData::NAME_WAIT, + NAME_WALK = RaceData::NAME_WALK, + NAME_RUN = RaceData::NAME_RUN, + NAME_CHANGE_WEAPON = RaceData::NAME_CHANGE_WEAPON, + NAME_DAMAGE = RaceData::NAME_DAMAGE, + NAME_DAMAGE_FLYING = RaceData::NAME_DAMAGE_FLYING, + NAME_STAND_UP = RaceData::NAME_STAND_UP, + NAME_DAMAGE_BACK = RaceData::NAME_DAMAGE_BACK, + NAME_DAMAGE_FLYING_BACK = RaceData::NAME_DAMAGE_FLYING_BACK, + NAME_STAND_UP_BACK = RaceData::NAME_STAND_UP_BACK, + NAME_DEAD = RaceData::NAME_DEAD, + NAME_DEAD_BACK = RaceData::NAME_DEAD_BACK, + NAME_NORMAL_ATTACK = RaceData::NAME_NORMAL_ATTACK, + NAME_COMBO_ATTACK_1 = RaceData::NAME_COMBO_ATTACK_1, + NAME_COMBO_ATTACK_2 = RaceData::NAME_COMBO_ATTACK_2, + NAME_COMBO_ATTACK_3 = RaceData::NAME_COMBO_ATTACK_3, + NAME_COMBO_ATTACK_4 = RaceData::NAME_COMBO_ATTACK_4, + NAME_COMBO_ATTACK_5 = RaceData::NAME_COMBO_ATTACK_5, + NAME_COMBO_ATTACK_6 = RaceData::NAME_COMBO_ATTACK_6, + NAME_COMBO_ATTACK_7 = RaceData::NAME_COMBO_ATTACK_7, + NAME_COMBO_ATTACK_8 = RaceData::NAME_COMBO_ATTACK_8, + NAME_INTRO_WAIT = RaceData::NAME_INTRO_WAIT, + NAME_INTRO_SELECTED = RaceData::NAME_INTRO_SELECTED, + NAME_INTRO_NOT_SELECTED = RaceData::NAME_INTRO_NOT_SELECTED, + NAME_SPAWN = RaceData::NAME_SPAWN, + NAME_FISHING_THROW = RaceData::NAME_FISHING_THROW, + NAME_FISHING_WAIT = RaceData::NAME_FISHING_WAIT, + NAME_FISHING_STOP = RaceData::NAME_FISHING_STOP, + NAME_FISHING_REACT = RaceData::NAME_FISHING_REACT, + NAME_FISHING_CATCH = RaceData::NAME_FISHING_CATCH, + NAME_FISHING_FAIL = RaceData::NAME_FISHING_FAIL, + NAME_STOP = RaceData::NAME_STOP, + NAME_SPECIAL_1 = RaceData::NAME_SPECIAL_1, + NAME_SPECIAL_2 = RaceData::NAME_SPECIAL_2, + NAME_SPECIAL_3 = RaceData::NAME_SPECIAL_3, + NAME_SPECIAL_4 = RaceData::NAME_SPECIAL_4, + NAME_SPECIAL_5 = RaceData::NAME_SPECIAL_5, + NAME_SPECIAL_6 = RaceData::NAME_SPECIAL_6, + NAME_SKILL = RaceData::NAME_SKILL, + NAME_SKILL_END = RaceData::NAME_SKILL_END, + NAME_CLAP = RaceData::NAME_CLAP, + NAME_CHEERS_1 = RaceData::NAME_CHEERS_1, + NAME_CHEERS_2 = RaceData::NAME_CHEERS_2, + NAME_KISS_START = RaceData::NAME_KISS_START, + NAME_KISS_WITH_WARRIOR = RaceData::NAME_KISS_WITH_WARRIOR, + NAME_KISS_WITH_ASSASSIN = RaceData::NAME_KISS_WITH_ASSASSIN, + NAME_KISS_WITH_SURA = RaceData::NAME_KISS_WITH_SURA, + NAME_KISS_WITH_SHAMAN = RaceData::NAME_KISS_WITH_SHAMAN, + NAME_FRENCH_KISS_START = RaceData::NAME_FRENCH_KISS_START, + NAME_FRENCH_KISS_WITH_WARRIOR = RaceData::NAME_FRENCH_KISS_WITH_WARRIOR, + NAME_FRENCH_KISS_WITH_ASSASSIN = RaceData::NAME_FRENCH_KISS_WITH_ASSASSIN, + NAME_FRENCH_KISS_WITH_SURA = RaceData::NAME_FRENCH_KISS_WITH_SURA, + NAME_FRENCH_KISS_WITH_SHAMAN = RaceData::NAME_FRENCH_KISS_WITH_SHAMAN, + NAME_SLAP_HIT_START = RaceData::NAME_SLAP_HIT_START, + NAME_SLAP_HIT_WITH_WARRIOR = RaceData::NAME_SLAP_HIT_WITH_WARRIOR, + NAME_SLAP_HIT_WITH_ASSASSIN = RaceData::NAME_SLAP_HIT_WITH_ASSASSIN, + NAME_SLAP_HIT_WITH_SURA = RaceData::NAME_SLAP_HIT_WITH_SURA, + NAME_SLAP_HIT_WITH_SHAMAN = RaceData::NAME_SLAP_HIT_WITH_SHAMAN, + NAME_SLAP_HURT_START = RaceData::NAME_SLAP_HURT_START, + NAME_SLAP_HURT_WITH_WARRIOR = RaceData::NAME_SLAP_HURT_WITH_WARRIOR, + NAME_SLAP_HURT_WITH_ASSASSIN = RaceData::NAME_SLAP_HURT_WITH_ASSASSIN, + NAME_SLAP_HURT_WITH_SURA = RaceData::NAME_SLAP_HURT_WITH_SURA, + NAME_SLAP_HURT_WITH_SHAMAN = RaceData::NAME_SLAP_HURT_WITH_SHAMAN, + NAME_DIG = RaceData::NAME_DIG, + NAME_DANCE_1 = RaceData::NAME_DANCE_1, + NAME_DANCE_2 = RaceData::NAME_DANCE_2, + NAME_DANCE_3 = RaceData::NAME_DANCE_3, + NAME_DANCE_4 = RaceData::NAME_DANCE_4, + NAME_DANCE_5 = RaceData::NAME_DANCE_5, + NAME_DANCE_6 = RaceData::NAME_DANCE_6, + NAME_DANCE_END = RaceData::NAME_DANCE_END, + NAME_CONGRATULATION = RaceData::NAME_CONGRATULATION, + NAME_FORGIVE = RaceData::NAME_FORGIVE, + NAME_ANGRY = RaceData::NAME_ANGRY, + NAME_ATTRACTIVE = RaceData::NAME_ATTRACTIVE, + NAME_SAD = RaceData::NAME_SAD, + NAME_SHY = RaceData::NAME_SHY, + NAME_CHEERUP = RaceData::NAME_CHEERUP, + NAME_BANTER = RaceData::NAME_BANTER, + NAME_JOY = RaceData::NAME_JOY, + NAME_MAX_NUM = RaceData::NAME_MAX_NUM, + }; +}; + } // namespace ava2 diff --git a/src/python_gameplay_modules.cpp b/src/python_gameplay_modules.cpp index 56598b03..66fca289 100644 --- a/src/python_gameplay_modules.cpp +++ b/src/python_gameplay_modules.cpp @@ -1319,6 +1319,14 @@ void SetSkillCoolTimeAt(int skillIndex,float coolTime,float now) { void SetSkillCoolTime(int skillIndex, float coolTime) { SetSkillCoolTimeAt(skillIndex,coolTime,float(SDL_GetTicks())/1000.0f); } +void EndSkillCoolTime(uint32_t skillIndex) { + auto slot = s_skillSlots.find(skillIndex); + if (slot == s_skillSlots.end()) return; + auto it = s_playerSkills.find(slot->second); + if (it != s_playerSkills.end()) { + it->second.cooldown = {}; + } +} // --------------------------------------------------------------------- // GroundItemStore & Chest Drop Cache diff --git a/src/python_gameplay_modules.h b/src/python_gameplay_modules.h index 9ac60d66..1662236f 100644 --- a/src/python_gameplay_modules.h +++ b/src/python_gameplay_modules.h @@ -17,6 +17,7 @@ using SkillCastCallback = std::function; void SetPlayerSkillCastCallback(SkillCastCallback cb); void SetSkillCoolTime(int skillIndex, float coolTime); void SetSkillCoolTimeAt(int skillIndex,float coolTime,float now); +void EndSkillCoolTime(uint32_t skillIndex); struct PlayerItemSlot { uint32_t vnum = 0; diff --git a/src/python_native_modules.cpp b/src/python_native_modules.cpp index ec6cbc69..3fda9cc4 100644 --- a/src/python_native_modules.cpp +++ b/src/python_native_modules.cpp @@ -1962,7 +1962,7 @@ static PyObject* renderTarget_ResetModel(PyObject*, PyObject* args) { int idx = 0; if (PyArg_ParseTuple(args, "i", &idx)) { auto target = ava2::CRenderTargetManager::Instance().GetRenderTarget(idx); - if (target) target->SelectModel(0); + if (target) target->ResetModel(); } Py_RETURN_NONE; } @@ -1972,7 +1972,7 @@ static PyObject* renderTarget_SetModelRender(PyObject*, PyObject* args) { PyObject* bStatus = nullptr; if (PyArg_ParseTuple(args, "iO", &idx, &bStatus)) { auto target = ava2::CRenderTargetManager::Instance().GetRenderTarget(idx); - if (target) target->SetVisibility(PyObject_IsTrue(bStatus)); + if (target) target->SetModelStatus(PyObject_IsTrue(bStatus)); } Py_RETURN_NONE; }