Skip to content

Commit fe8d6bc

Browse files
danielkrupinskidanielkrupinski
authored
Merge pull request #2901 from danielkrupinski/inventory-changer
Introducing Inventory Changer
2 parents 60f0a32 + 540c9d7 commit fe8d6bc

21 files changed

+2125
-1416
lines changed

‎Osiris/Config.cpp‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -509,18 +509,19 @@ void Config::load(const char8_t* name, bool incremental) noexcept
509509
read(j, "Triggerbot", triggerbot);
510510
read(j, "Triggerbot Key", triggerbotHoldKey);
511511

512-
AntiAim::fromJson(j["Anti aim"]);
513-
Backtrack::fromJson(j["Backtrack"]);
514-
Glow::fromJson(j["Glow"]);
515512
read(j, "Chams", chams);
516513
read(j["Chams"], "Toggle Key", chamsToggleKey);
517514
read(j["Chams"], "Hold Key", chamsHoldKey);
518515
read<value_t::object>(j, "ESP", streamProofESP);
519516
read<value_t::object>(j, "Visuals", visuals);
520-
SkinChanger::fromJson(j["Skin changer"]);
521-
::Sound::fromJson(j["Sound"]);
522517
read<value_t::object>(j, "Style", style);
523518
read<value_t::object>(j, "Misc", misc);
519+
520+
AntiAim::fromJson(j["Anti aim"]);
521+
Backtrack::fromJson(j["Backtrack"]);
522+
Glow::fromJson(j["Glow"]);
523+
InventoryChanger::fromJson(j["Inventory Changer"]);
524+
Sound::fromJson(j["Sound"]);
524525
}
525526

526527
static void to_json(json& j, const ColorToggle& o, const ColorToggle& dummy = {})
@@ -949,7 +950,7 @@ void Config::save(size_t id) const noexcept
949950
j["Visuals"] = visuals;
950951
j["Misc"] = misc;
951952
j["Style"] = style;
952-
j["Skin changer"] = SkinChanger::toJson();
953+
j["Inventory Changer"] = InventoryChanger::toJson();
953954

954955
removeEmptyObjects(j);
955956

@@ -983,17 +984,18 @@ void Config::rename(size_t item, const char* newName) noexcept
983984
void Config::reset() noexcept
984985
{
985986
aimbot = { };
986-
AntiAim::resetConfig();
987987
triggerbot = { };
988-
Backtrack::resetConfig();
989-
Glow::resetConfig();
990988
chams = { };
991989
streamProofESP = { };
992990
visuals = { };
993-
SkinChanger::resetConfig();
994-
Sound::resetConfig();
995991
style = { };
996992
misc = { };
993+
994+
AntiAim::resetConfig();
995+
Backtrack::resetConfig();
996+
Glow::resetConfig();
997+
InventoryChanger::resetConfig();
998+
Sound::resetConfig();
997999
}
9981000

9991001
void Config::listConfigs() noexcept

‎Osiris/Config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <vector>
1010

1111
#include "imgui/imgui.h"
12-
#include "Hacks/SkinChanger.h"
12+
#include "Hacks/InventoryChanger.h"
1313
#include "ConfigStructs.h"
1414
#include "InputUtil.h"
1515

‎Osiris/EventListener.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "fnv.h"
66
#include "GameData.h"
77
#include "Hacks/Misc.h"
8-
#include "Hacks/SkinChanger.h"
8+
#include "Hacks/InventoryChanger.h"
99
#include "Hacks/Visuals.h"
1010
#include "Interfaces.h"
1111
#include "Memory.h"
@@ -49,8 +49,8 @@ void EventListener::fireGameEvent(GameEvent* event)
4949
Misc::purchaseList(event);
5050
break;
5151
case fnv::hash("player_death"):
52-
SkinChanger::updateStatTrak(*event);
53-
SkinChanger::overrideHudIcon(*event);
52+
InventoryChanger::updateStatTrak(*event);
53+
InventoryChanger::overrideHudIcon(*event);
5454
Misc::killMessage(*event);
5555
Misc::killSound(*event);
5656
break;

‎Osiris/GUI.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "Config.h"
2424
#include "ConfigStructs.h"
2525
#include "Hacks/Misc.h"
26-
#include "Hacks/SkinChanger.h"
26+
#include "Hacks/InventoryChanger.h"
2727
#include "Helpers.h"
2828
#include "Hooks.h"
2929
#include "Interfaces.h"
@@ -107,7 +107,7 @@ void GUI::render() noexcept
107107
renderChamsWindow();
108108
renderStreamProofESPWindow();
109109
renderVisualsWindow();
110-
SkinChanger::drawGUI(false);
110+
InventoryChanger::drawGUI(false);
111111
Sound::drawGUI(false);
112112
renderStyleWindow();
113113
renderMiscWindow();
@@ -183,7 +183,7 @@ void GUI::renderMenuBar() noexcept
183183
menuBarItem("Chams", window.chams);
184184
menuBarItem("ESP", window.streamProofESP);
185185
menuBarItem("Visuals", window.visuals);
186-
SkinChanger::menuBarItem();
186+
InventoryChanger::menuBarItem();
187187
Sound::menuBarItem();
188188
menuBarItem("Style", window.style);
189189
menuBarItem("Misc", window.misc);
@@ -1311,13 +1311,13 @@ void GUI::renderConfigWindow(bool contentOnly) noexcept
13111311
ImGui::OpenPopup("Config to reset");
13121312

13131313
if (ImGui::BeginPopup("Config to reset")) {
1314-
static constexpr const char* names[]{ "Whole", "Aimbot", "Triggerbot", "Backtrack", "Anti aim", "Glow", "Chams", "ESP", "Visuals", "Skin changer", "Sound", "Style", "Misc" };
1314+
static constexpr const char* names[]{ "Whole", "Aimbot", "Triggerbot", "Backtrack", "Anti aim", "Glow", "Chams", "ESP", "Visuals", "Inventory Changer", "Sound", "Style", "Misc" };
13151315
for (int i = 0; i < IM_ARRAYSIZE(names); i++) {
13161316
if (i == 1) ImGui::Separator();
13171317

13181318
if (ImGui::Selectable(names[i])) {
13191319
switch (i) {
1320-
case 0: config->reset(); updateColors(); Misc::updateClanTag(true); SkinChanger::scheduleHudUpdate(); break;
1320+
case 0: config->reset(); updateColors(); Misc::updateClanTag(true); InventoryChanger::scheduleHudUpdate(); break;
13211321
case 1: config->aimbot = { }; break;
13221322
case 2: config->triggerbot = { }; break;
13231323
case 3: Backtrack::resetConfig(); break;
@@ -1326,7 +1326,7 @@ void GUI::renderConfigWindow(bool contentOnly) noexcept
13261326
case 6: config->chams = { }; break;
13271327
case 7: config->streamProofESP = { }; break;
13281328
case 8: config->visuals = { }; break;
1329-
case 9: SkinChanger::resetConfig(); SkinChanger::scheduleHudUpdate(); break;
1329+
case 9: InventoryChanger::resetConfig(); InventoryChanger::scheduleHudUpdate(); break;
13301330
case 10: Sound::resetConfig(); break;
13311331
case 11: config->style = { }; updateColors(); break;
13321332
case 12: config->misc = { }; Misc::updateClanTag(true); break;
@@ -1339,7 +1339,7 @@ void GUI::renderConfigWindow(bool contentOnly) noexcept
13391339
if (ImGui::Button("Load selected", { 100.0f, 25.0f })) {
13401340
config->load(currentConfig, incrementalLoad);
13411341
updateColors();
1342-
SkinChanger::scheduleHudUpdate();
1342+
InventoryChanger::scheduleHudUpdate();
13431343
Misc::updateClanTag(true);
13441344
}
13451345
if (ImGui::Button("Save selected", { 100.0f, 25.0f }))
@@ -1386,7 +1386,7 @@ void GUI::renderGuiStyle2() noexcept
13861386
renderVisualsWindow(true);
13871387
ImGui::EndTabItem();
13881388
}
1389-
SkinChanger::tabItem();
1389+
InventoryChanger::tabItem();
13901390
Sound::tabItem();
13911391
if (ImGui::BeginTabItem("Style")) {
13921392
renderStyleWindow(true);

0 commit comments

Comments
 (0)