Skip to content

Commit 326eabc

Browse files
committed
i hdate my stupid self
1 parent 7b87a56 commit 326eabc

6 files changed

Lines changed: 34 additions & 4 deletions

File tree

changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
- Fixed Button Module keybinds repeating
77
- Fixed blue hitbox being the wrong size
88
- Improved small part of UI
9+
- Localisation:
10+
-- Added Turkish
11+
-- Added Argentina Spanish
12+
-- Updated Mexican Spanish
13+
-- Updated Latin American Spanish
14+
-- Updated Vietnamese
15+
-- Updated Ukrainian
16+
-- Updated Russian
17+
-- Updated Brazilian Portuguese
918

1019
# 2.8.6
1120

src/Client/Module.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,26 @@ bool Module::getRealEnabled()
4646

4747
if (auto pl = PlayLayer::get(); pl && pl->m_started)
4848
{
49-
if (pl->m_player1->m_isDead || (pl->m_player2 && pl->m_player2->m_isDead))
49+
if (pl->m_isPlatformer || pl->m_player1->m_isDead || (pl->m_player2 && pl->m_player2->m_isDead))
5050
return userEnabled;
5151

5252
bool inRange;
5353
bool ret = enableRanges.getEnable(pl->getCurrentPercent(), userEnabled, &inRange);
5454

5555
if (inRange && ret != userEnabled)
56+
{
5657
SafeMode::get()->onModuleToggled(this);
58+
}
59+
60+
if (inRange != lastRetRange)
61+
{
62+
onRangeToggleSendNotif(ret);
63+
lastRetRange = inRange;
64+
}
5765

5866
return ret;
5967
}
60-
68+
lastRetRange = false;
6169
return userEnabled;
6270
}
6371

@@ -480,6 +488,14 @@ std::string Module::getNotificationString()
480488
return utils::string::replace(LocalisationManager::get()->getLocalisedString(str), "%s", getName());
481489
}
482490

491+
void Module::onRangeToggleSendNotif(bool en)
492+
{
493+
if (en == userEnabled)
494+
return;
495+
496+
log::error("entered range: {}, {}, {}", getID(), lastRetRange, en);
497+
}
498+
483499
qolmod::Ranges* Module::getRanges()
484500
{
485501
return &enableRanges;

src/Client/Module.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ class Module
7272
int sortPriority = 8008135;
7373
KeyConfigStruct keyConfig = {};
7474
bool showSeperateOptionsInfo = false;
75+
7576
qolmod::Ranges enableRanges = {};
77+
bool lastRetRange = false;
7678

7779
bool shortcutEnabled = false;
7880
cocos2d::CCNode* shortcutNode = nullptr;
@@ -155,6 +157,8 @@ class Module
155157
int getSortPriority();
156158
bool isDisabled();
157159

160+
void onRangeToggleSendNotif(bool en);
161+
158162
float getSearchWeight(std::string query);
159163

160164
virtual ModuleNode* getNode();

src/GUI/Categories/SpeedhackNode.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ void SpeedhackNode::updatePresets()
122122
{
123123
auto spr = ButtonSprite::create(floatToStringMin2DP(preset.value).c_str(), "bigFont.fnt", presetDeleteMode ? "GJ_button_06.png" : "GJ_button_05.png");
124124
auto btn = Button::create(spr, this, presetDeleteMode ? menu_selector(SpeedhackNode::onRemovePreset) : menu_selector(SpeedhackNode::onApplyPreset));
125+
btn->m_scaleMultiplier = 1.1f;
125126
presetMenu->addChild(btn);
126127
presetBtns.emplace(btn, preset.value);
127128
}

src/GUI/OptionsUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ bool OptionsUI::setup()
129129
if (!Mod::get()->getSavedValue<bool>("has-shown-seperate-info"))
130130
{
131131
pulsingCircle = []{
132-
auto circle = PulsingCircle::create(2.5f, 18, 1.0f, false, false);
132+
auto circle = PulsingCircle::create(2.5f, 15, 0.8f, false, true);
133133
circle->color = ccWHITE;
134134
return circle;
135135
}();

0 commit comments

Comments
 (0)