Changed from Button to Hotkey(Animation Changer)

This commit is contained in:
Joaquin 2022-08-01 05:14:29 -06:00
parent be2546903a
commit 42f260ab95
2 changed files with 39 additions and 34 deletions

View File

@ -219,11 +219,13 @@ namespace cheat::feature
"Blocking_Hit",
"Blocking_AS"
};
static std::string currentAnimation{};
AnimationChanger::AnimationChanger() : Feature(),
NF(f_Enabled, "Animation Changer", "Visuals::AnimationChanger", false),
NF(f_ApplyAnimation, "Apply Animation", "Visuals::AnimationChanger", false),
NF(f_ResetAnimation, "Reset Animation", "Visuals::AnimationChanger", false)
NF(f_Animation, "Animation", "Visuals::AnimationChanger", "ExtraAttack"),
NF(f_ApplyKey, "Apply Animation", "Visuals::AnimationChanger", Hotkey('Y')),
NF(f_ResetKey, "Reset Animation", "Visuals::AnimationChanger", Hotkey('R')),
toBeUpdate(), nextUpdate(0)
{
events::GameUpdateEvent += MY_METHOD_HANDLER(AnimationChanger::OnGameUpdate);
}
@ -235,17 +237,19 @@ namespace cheat::feature
}
void AnimationChanger::DrawMain()
{
ImGui::BeginGroupPanel("Animation Changer");
{
ConfigWidget(f_Enabled, "Changes active character's animation.\nNot all animations work for every character except Main Character.");
if (f_Enabled)
{
if (ImGui::BeginCombo("Animations", currentAnimation.c_str()))
if (ImGui::BeginCombo("Animations", f_Animation.value().c_str()))
{
for (int n = 0; n < IM_ARRAYSIZE(animations); n++)
{
bool is_selected = (currentAnimation.c_str() == animations[n]);
bool is_selected = (f_Animation.value().c_str() == animations[n]);
if (ImGui::Selectable(animations[n].c_str(), is_selected))
currentAnimation = animations[n];
f_Animation.value() = animations[n];
if (is_selected)
ImGui::SetItemDefaultFocus();
@ -253,13 +257,11 @@ namespace cheat::feature
ImGui::EndCombo();
}
if (ImGui::Button("Apply"))
f_ApplyAnimation = true;
ImGui::SameLine();
if (ImGui::Button("Reset"))
f_ResetAnimation = true;
ConfigWidget("Apply Key", f_ApplyKey, true);
ConfigWidget("Reset Key", f_ResetKey, true);
}
}
ImGui::EndGroupPanel();
}
bool AnimationChanger::NeedStatusDraw() const
@ -283,21 +285,21 @@ namespace cheat::feature
if (!f_Enabled)
return;
auto currentTime = util::GetCurrentTimeMillisec();
if (currentTime < nextUpdate)
return;
auto& manager = game::EntityManager::instance();
auto avatar = manager.avatar();
if (avatar->animator() == nullptr)
return;
if (f_Enabled && f_ApplyAnimation)
{
app::Animator_Play(avatar->animator(), string_to_il2cppi(currentAnimation.c_str()), 0, 0, nullptr);
f_ApplyAnimation = false;
}
if (f_ApplyKey.value().IsPressed())
app::Animator_Play(avatar->animator(), string_to_il2cppi(f_Animation.value().c_str()), 0, 0, nullptr);
if (f_Enabled && f_ResetAnimation)
{
if (f_ResetKey.value().IsPressed())
app::Animator_Rebind(avatar->animator(), nullptr);
f_ResetAnimation = false;
}
nextUpdate = currentTime + (int)f_DelayUpdate;
}
}

View File

@ -1,6 +1,7 @@
#pragma once
#include <cheat-base/cheat/Feature.h>
#include <cheat-base/config/config.h>
#include <cheat-base/thread-safe.h>
namespace cheat::feature
{
@ -9,19 +10,21 @@ namespace cheat::feature
{
public:
config::Field<config::Toggle<Hotkey>> f_Enabled;
config::Field<config::Toggle<Hotkey>> f_ApplyAnimation;
config::Field<config::Toggle<Hotkey>> f_ResetAnimation;
static AnimationChanger& GetInstance();
config::Field<std::string> f_Animation;
config::Field<Hotkey> f_ApplyKey;
config::Field<Hotkey> f_ResetKey;
const FeatureGUIInfo& GetGUIInfo() const override;
void DrawMain() override;
virtual bool NeedStatusDraw() const override;
void DrawStatus() override;
static AnimationChanger& GetInstance();
void OnGameUpdate();
private:
SafeQueue<uint32_t> toBeUpdate;
SafeValue<int64_t> nextUpdate;
int f_DelayUpdate = 500;
AnimationChanger();
};
}