Updated all offsets

This commit is contained in:
Joaquin 2022-08-21 22:35:01 -06:00
parent 0b94ba74ae
commit eddf367284
9 changed files with 14 additions and 16 deletions

View File

@ -1,12 +1,12 @@
{ {
"game_version": "2.8", "game_version": "3.0",
"modules": { "modules": {
"UnityPlayer.dll": { "UnityPlayer.dll": {
"checksum": 4999961552328781053, "checksum": 18225598526199471527,
"timestamp": 0 "timestamp": 0
}, },
"UserAssembly.dll": { "UserAssembly.dll": {
"checksum": 807890720029543258, "checksum": 10799527772725786707,
"timestamp": 0 "timestamp": 0
} }
} }

View File

@ -789,7 +789,7 @@ namespace cheat::feature
ADD_FILTER_FIELD(plant, SweetFlower); ADD_FILTER_FIELD(plant, SweetFlower);
ADD_FILTER_FIELD(plant, Valberry); ADD_FILTER_FIELD(plant, Valberry);
ADD_FILTER_FIELD(plant, Violetgrass); ADD_FILTER_FIELD(plant, Violetgrass);
//ADD_FILTER_FIELD(plant, Viparyas); ADD_FILTER_FIELD(plant, Viparyas);
ADD_FILTER_FIELD(plant, WindwheelAster); ADD_FILTER_FIELD(plant, WindwheelAster);
ADD_FILTER_FIELD(plant, Wolfhook); ADD_FILTER_FIELD(plant, Wolfhook);
ADD_FILTER_FIELD(plant, ZaytunPeach); ADD_FILTER_FIELD(plant, ZaytunPeach);

View File

@ -24,7 +24,7 @@ namespace cheat::game
entityFilters[filter] = { false, 0 }; entityFilters[filter] = { false, 0 };
auto& entry = entityFilters[filter]; auto& entry = entityFilters[filter];
auto timestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr); auto timestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr);
if (entry.second + m_LifeTime > timestamp) if (entry.second + m_LifeTime > timestamp)
return entry.first; return entry.first;

View File

@ -277,7 +277,7 @@ namespace cheat::game::filters
SimpleFilter Padisarah = { EntityType__Enum_1::GatherObject, "_Pasusalan" }; SimpleFilter Padisarah = { EntityType__Enum_1::GatherObject, "_Pasusalan" };
SimpleFilter RukkhashavaMushrooms = { EntityType__Enum_1::GatherObject, "_HolyMushroom" }; SimpleFilter RukkhashavaMushrooms = { EntityType__Enum_1::GatherObject, "_HolyMushroom" };
SimpleFilter SumeruRose = { EntityType__Enum_1::GatherObject, "_XumiRose" }; SimpleFilter SumeruRose = { EntityType__Enum_1::GatherObject, "_XumiRose" };
//SimpleFilter Viparyas = { EntityType__Enum_1::GatherObject, "_" }; SimpleFilter Viparyas = { EntityType__Enum_1::GatherObject, "_DreamerPlant" };
SimpleFilter ZaytunPeach = { EntityType__Enum_1::GatherObject, "_Olea" }; SimpleFilter ZaytunPeach = { EntityType__Enum_1::GatherObject, "_Olea" };
} }

View File

@ -277,7 +277,7 @@ namespace cheat::game::filters
extern SimpleFilter Padisarah; extern SimpleFilter Padisarah;
extern SimpleFilter RukkhashavaMushrooms; extern SimpleFilter RukkhashavaMushrooms;
extern SimpleFilter SumeruRose; extern SimpleFilter SumeruRose;
//extern SimpleFilter Viparyas; extern SimpleFilter Viparyas;
extern SimpleFilter ZaytunPeach; extern SimpleFilter ZaytunPeach;
} }

View File

@ -45,8 +45,7 @@ namespace cheat::feature
ConfigWidget("Multi-hit Mode", f_MultiHit, "Enables multi-hit.\n" \ ConfigWidget("Multi-hit Mode", f_MultiHit, "Enables multi-hit.\n" \
"Multiplies your attack count.\n" \ "Multiplies your attack count.\n" \
"This is not well tested, and can be detected by anticheat.\n" \ "This is not well tested, and can be detected by anticheat.\n" \
"Not recommended to be used with main accounts or used with high values.\n" \ "Not recommended to be used with main accounts or used with high values.\n");
"Known issues with certain multi-hit attacks, e.g. Xiao E, Ayaka CA, etc.");
ImGui::Indent(); ImGui::Indent();
@ -269,7 +268,6 @@ namespace cheat::feature
for (int i = 0; i < attackCount; i++) for (int i = 0; i < attackCount; i++)
app::MoleMole_LCBaseCombat_FireBeingHitEvent(__this, entity->runtimeID(), attackResult, method); app::MoleMole_LCBaseCombat_FireBeingHitEvent(__this, entity->runtimeID(), attackResult, method);
} }
else app::MoleMole_LCBaseCombat_FireBeingHitEvent(__this, entity->runtimeID(), attackResult, method);
} }
CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, targetID, attackResult, ignoreCheckCanBeHitInMP, method); CALL_ORIGIN(LCBaseCombat_DoHitEntity_Hook, __this, targetID, attackResult, ignoreCheckCanBeHitInMP, method);

View File

@ -56,7 +56,7 @@ namespace cheat::feature
void AutoChallenge::OnGameUpdate() void AutoChallenge::OnGameUpdate()
{ {
static uint64_t lastTime = 0; static uint64_t lastTime = 0;
auto timestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr); auto timestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr);
if (!f_Enabled || lastTime + f_Delay > timestamp) if (!f_Enabled || lastTime + f_Delay > timestamp)
return; return;

View File

@ -91,7 +91,7 @@ namespace cheat::feature
} }
std::lock_guard<std::mutex> catchLock(autoFish.m_BattleFinishTimestampMutex); std::lock_guard<std::mutex> catchLock(autoFish.m_BattleFinishTimestampMutex);
autoFish.m_BattleFinishTimestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr) + autoFish.f_DelayBeforeCatch; autoFish.m_BattleFinishTimestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr) + autoFish.f_DelayBeforeCatch;
} }
void AutoFish::FishingModule_OnFishBattleEndRsp_Hook(void* __this, app::FishBattleEndRsp* rsp, MethodInfo* method) void AutoFish::FishingModule_OnFishBattleEndRsp_Hook(void* __this, app::FishBattleEndRsp* rsp, MethodInfo* method)
@ -115,7 +115,7 @@ namespace cheat::feature
{ {
LOG_WARNING("Failed to catch fish, retrying in %u ms", autoFish.f_DelayBeforeCatch); LOG_WARNING("Failed to catch fish, retrying in %u ms", autoFish.f_DelayBeforeCatch);
std::lock_guard<std::mutex> catchLock(autoFish.m_BattleFinishTimestampMutex); std::lock_guard<std::mutex> catchLock(autoFish.m_BattleFinishTimestampMutex);
autoFish.m_BattleFinishTimestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr) + autoFish.f_DelayBeforeCatch; autoFish.m_BattleFinishTimestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr) + autoFish.f_DelayBeforeCatch;
return; return;
} }
@ -123,7 +123,7 @@ namespace cheat::feature
return; return;
std::lock_guard<std::mutex> _lock(autoFish.m_RecastTimestampMutex); std::lock_guard<std::mutex> _lock(autoFish.m_RecastTimestampMutex);
autoFish.m_RecastTimestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr) + autoFish.f_DelayBeforeRecast; autoFish.m_RecastTimestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr) + autoFish.f_DelayBeforeRecast;
} }
void AutoFish::FishingModule_OnExitFishingRsp_Hook(void* __this, void* rsp, MethodInfo* method) void AutoFish::FishingModule_OnExitFishingRsp_Hook(void* __this, void* rsp, MethodInfo* method)
@ -154,7 +154,7 @@ namespace cheat::feature
void AutoFish::OnGameUpdate() void AutoFish::OnGameUpdate()
{ {
auto timestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr); auto timestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr);
std::lock_guard<std::mutex> _lock(m_BattleFinishTimestampMutex); std::lock_guard<std::mutex> _lock(m_BattleFinishTimestampMutex);
std::lock_guard<std::mutex> _lock2(m_RecastTimestampMutex); std::lock_guard<std::mutex> _lock2(m_RecastTimestampMutex);

View File

@ -162,7 +162,7 @@ namespace cheat::feature
static std::unordered_set<app::SceneTreeObject*> s_AttackQueueSet; static std::unordered_set<app::SceneTreeObject*> s_AttackQueueSet;
static uint64_t s_LastAttackTimestamp = 0; static uint64_t s_LastAttackTimestamp = 0;
uint64_t timestamp = app::MoleMole_TimeUtil_get_NowTimeStamp(nullptr); uint64_t timestamp = app::MoleMole_TimeUtil_get_LocalNowMsTimeStamp(nullptr);
if (!m_Enabled || s_LastAttackTimestamp + m_AttackDelay > timestamp) if (!m_Enabled || s_LastAttackTimestamp + m_AttackDelay > timestamp)
return; return;