Skip to content

Commit 4e361df

Browse files
committed
Revert "hmmmmmmmmmmmmmm"
This reverts commit be3b409.
1 parent be3b409 commit 4e361df

File tree

4 files changed

+2
-57
lines changed

4 files changed

+2
-57
lines changed

mod.json

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"geode": "4.7.0",
2+
"geode": "4.4.0",
33
"gd": {
44
"win": "2.2074",
55
"mac": "2.2074",
66
"ios": "2.2074",
77
"android": "2.2074"
88
},
9-
"version": "v1.7.3",
9+
"version": "v1.7.2",
1010
"id": "raydeeux.deathscreentweaks",
1111
"name": "DeathScreenTweaks",
1212
"developers": [
@@ -39,24 +39,6 @@
3939
"type": "bool",
4040
"default": false
4141
},
42-
"screenshotOnDeath": {
43-
"name": "Auto-Screenshot on Death",
44-
"description": "Automatically take a screenshot when getting a New Best.\n\n<cy>\"But this could've been a toggle in PRNTSCRN!\"</c> No.",
45-
"type": "bool",
46-
"default": false
47-
},
48-
"screenshotOnDeathPreference": {
49-
"name": "Auto-Screenshot Preferred Type (READ!)",
50-
"description": "Pick the kind of screenshot you want. No, you can't have all of the types of screenshots; pick wisely!\n\n<cy>\"But this could've been a toggle in PRNTSCRN!\"</c> No.",
51-
"type": "string",
52-
"default": "Screenshot As-Is",
53-
"one-of": [
54-
"Screenshot As-Is",
55-
"Screenshot the Level, Keep UI",
56-
"Screenshot the Level, Hide (~99% of) UI",
57-
"Screenshot the Level, Use PRNTSCRN Settings"
58-
]
59-
},
6042
"changeDeathText": {
6143
"name": "Change \"New Best\" Texts",
6244
"description": "Leaving this enabled is semi-important, since it's kind of the original purpose of this mod. You can disable it though if you want, I guess.",
@@ -326,9 +308,6 @@
326308
"resources/*.mp3"
327309
]
328310
},
329-
"dependencies": {
330-
"ninxout.prntscrn": ">=1.0.3"
331-
},
332311
"incompatibilities": {
333312
"raydeeux.disturbingnewbests": {
334313
"version": ">=1.0.0",

src/Manager.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class Manager {
2323

2424
bool completedJDDNCheck = false;
2525

26-
bool hasPRNTSCRN = false;
2726
bool hasNextKeyWhenLoaded = false;
2827
bool addedNextKeyWhenLabel = false;
2928

src/MenuLayer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class $modify(MyMenuLayer, MenuLayer) {
2222
}
2323
manager->completedJDDNCheck = true;
2424
manager->hasNextKeyWhenLoaded = Loader::get()->isModLoaded("alphalaneous.next_key_when");
25-
manager->hasPRNTSCRN = Loader::get()->isModLoaded("ninxout.prntscrn");
2625
return true;
2726
}
2827
};

src/PlayLayer.cpp

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <ninxout.prntscrn/include/api.hpp>
21
#include <Geode/modify/PlayLayer.hpp>
32
#include <algorithm>
43
#include <random>
@@ -19,28 +18,6 @@ class $modify(MyPlayLayer, PlayLayer) {
1918
static bool isNewBest(PlayLayer* pl) {
2019
return pl->getCurrentPercentInt() > pl->m_level->m_normalPercent.value();
2120
}
22-
static bool isNewBestFloat(PlayLayer* pl) {
23-
return pl->getCurrentPercent() > pl->m_level->m_normalPercent.value();
24-
}
25-
void PRNTSCRNOnDeath(float) {
26-
const std::string& screenshotPreference = getModString("screenshotOnDeathPreference");
27-
log::info("screenshotPreference: {}", screenshotPreference);
28-
if (!manager->hasPRNTSCRN) return;
29-
log::info("screenshotPreference: {}, mod is loaded", screenshotPreference);
30-
if (screenshotPreference == "Screenshot the Level, Keep UI") {
31-
(void) PRNTSCRN::screenshotPlayLayerWithoutAnyVisibilityFilters();
32-
} else if (screenshotPreference == "Screenshot the Level, Hide (~99% of) UI") {
33-
bool originalSetting = Loader::get()->getLoadedMod("ninxout.prntscrn")->getSettingValue<bool>("hide-ui");
34-
Loader::get()->getLoadedMod("ninxout.prntscrn")->setSettingValue<bool>("hide-ui", true);
35-
(void) PRNTSCRN::screenshotNode(this);
36-
Loader::get()->getLoadedMod("ninxout.prntscrn")->setSettingValue<bool>("hide-ui", originalSetting);
37-
} else if (screenshotPreference == "Screenshot the Level, Use PRNTSCRN Settings") {
38-
(void) PRNTSCRN::screenshotNode(this);
39-
} else {
40-
(void) PRNTSCRN::screenshotNode(CCScene::get());
41-
}
42-
log::info("screenshot Taken?");
43-
}
4421
void resetLevel() {
4522
PlayLayer::resetLevel();
4623
Manager::getSharedInstance()->addedNextKeyWhenLabel = false;
@@ -168,13 +145,4 @@ class $modify(MyPlayLayer, PlayLayer) {
168145
if (fontID != 0 && fontID != -3 && getModBool("customFontGoldColor")) hopefullyALabel->setColor({254, 207, 6});
169146
}
170147
}
171-
void showNewBest(bool newReward, int orbs, int diamonds, bool demonKey, bool noRetry, bool noTitle) {
172-
PlayLayer::showNewBest(newReward, orbs, diamonds, demonKey, noRetry, noTitle);
173-
log::info("isNewBestFloat: {}", MyPlayLayer::isNewBestFloat(this));
174-
log::info("manager->hasPRNTSCRN: {}", manager->hasPRNTSCRN);
175-
if (manager->hasPRNTSCRN && MyPlayLayer::isNewBestFloat(this) && getModBool("screenshotOnDeath")) {
176-
log::info("screenshottingg.......");
177-
this->scheduleOnce(schedule_selector(MyPlayLayer::PRNTSCRNOnDeath), .5f);
178-
}
179-
}
180148
};

0 commit comments

Comments
 (0)