make code shorter tm

Author: ComputerElite

mod.json

@@ -5,10 +5,10 @@
   "version": "0.2.0",
   "author": "ComputerElite",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.16.1",
+  "packageVersion": "1.16.2",
   "modFiles": [
     "libCrashMod.so"
   ],
   "dependencies": [],
   "fileCopies": []
-}
+}

src/CrashModViewController.cpp

@@ -60,6 +60,11 @@ void DidActivate(ViewController* self, bool firstActivation, bool addedToHierarc
         // CrashOnNoFailOn
         QuestUI::BeatSaberUI::AddHoverHint(AddConfigValueToggle(container->get_transform(), getModConfig().CrashOnNoFailOn)->get_gameObject(), "No fail is a great feature (especially for torture). So why don't just let you not do it at all?");
 
+        // CrashOnNotFullCombo
+        QuestUI::BeatSaberUI::AddHoverHint(AddConfigValueToggle(container->get_transform(), getModConfig().CrashOnNotFullCombo)->get_gameObject(), "Do a full combo or crash");
+
+        // CrashOnNewHighscore
+        QuestUI::BeatSaberUI::AddHoverHint(AddConfigValueToggle(container->get_transform(), getModConfig().CrashOnNewHighscore)->get_gameObject(), "Why would you want new high scores??? Don't get better");
 
         // BatteryThreshold
         QuestUI::BeatSaberUI::AddHoverHint(AddConfigValueIncrementFloat(container->get_transform(), getModConfig().BatteryThreshold, 0, 1.0f, 0.0f, 100.0f)->get_gameObject(), "Over this percentage your game will crash.");

src/main.cpp

@@ -16,6 +16,8 @@
 #include "GlobalNamespace/PauseController.hpp"
 #include "GlobalNamespace/NoteCutInfo.hpp"
 #include "GlobalNamespace/OVRPlugin_OVRP_1_1_0.hpp"
+#include "GlobalNamespace/ResultsViewController.hpp"
+#include "GlobalNamespace/LevelCompletionResults.hpp"
 
 #include "beatsaber-hook/shared/config/config-utils.hpp"
 
@@ -44,93 +46,58 @@ Logger& getLogger() {
 void Crash() {
     getModConfig().CrashCounter.SetValue(getModConfig().CrashCounter.GetValue() + 1);
     getLogger().info("Crash number " + std::to_string(getModConfig().CrashCounter.GetValue()) + " by Crash mod");
-    if(getModConfig().OnCrashAction.GetValue() == 0) {
-        CRASH_UNLESS(false);
-    } else if (getModConfig().OnCrashAction.GetValue() == 1){
-        Application::Quit();
-    } else if (getModConfig().OnCrashAction.GetValue() == 2){
-        while (true)
-        {
-            malloc(1024);
-        }
-    }
+    if(getModConfig().OnCrashAction.GetValue() == 0) CRASH_UNLESS(false);
+    else if (getModConfig().OnCrashAction.GetValue() == 1) Application::Quit();
+    else if (getModConfig().OnCrashAction.GetValue() == 2) while (true) malloc(1024);
 }
 
 MAKE_HOOK_OFFSETLESS(ScoreController_HandleNoteWasMissed, void, ScoreController* self, NoteController* note) {
     ScoreController_HandleNoteWasMissed(self, note);
-    if(getModConfig().Active.GetValue()) {
-        if(getModConfig().MissCrash.GetValue()) Crash();
-    }
+    if(getModConfig().Active.GetValue() && getModConfig().MissCrash.GetValue()) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(ScoreController_HandleNoteWasCut, void, ScoreController* self, NoteController* note, NoteCutInfo* info) {
     ScoreController_HandleNoteWasCut(self, note, info);
-    if(getModConfig().Active.GetValue()) {
-        if(info->get_allIsOK() && getModConfig().CrashOnGoodCut.GetValue()) Crash();
-    }
+    if(getModConfig().Active.GetValue() && info->get_allIsOK() && getModConfig().CrashOnGoodCut.GetValue()) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(RelativeScoreAndImmediateRankCounter_UpdateRelativeScoreAndImmediateRank, void, RelativeScoreAndImmediateRankCounter* self, int score, int modifiedscore, int maxscore, int maxmodfifiedscore) {
     RelativeScoreAndImmediateRankCounter_UpdateRelativeScoreAndImmediateRank(self, score, modifiedscore, maxscore, maxmodfifiedscore);
-    if(getModConfig().Active.GetValue()) {
-
-        float percentage = self->get_relativeScore();
-        //getLogger().info("current Score percentage: " + std::to_string(percentage));
-        if(getModConfig().PercentageActive.GetValue()) {
-            if(percentage < getModConfig().Percentage.GetValue() / 100) Crash();
-        }
-    }
+    if(getModConfig().Active.GetValue() && getModConfig().PercentageActive.GetValue() && self->get_relativeScore() < getModConfig().Percentage.GetValue() / 100) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(StandardLevelScenesTransitionSetupDataSO_Init, void, StandardLevelScenesTransitionSetupDataSO* self, Il2CppString* gameMode, IDifficultyBeatmap* dbm, IPreviewBeatmapLevel previewBeatmapLevel, OverrideEnvironmentSettings* overrideEnvironmentSettings, ColorScheme* overrideColorScheme, GameplayModifiers* gameplayModifiers, PlayerSpecificSettings* playerSpecificSettings, PracticeSettings* practiceSettings, Il2CppString* backButtonText, bool useTestNoteCutSoundEffects) {
     StandardLevelScenesTransitionSetupDataSO_Init(self, gameMode, dbm, previewBeatmapLevel, overrideEnvironmentSettings, overrideColorScheme, gameplayModifiers, playerSpecificSettings, practiceSettings, backButtonText, useTestNoteCutSoundEffects);
     if(getModConfig().Active.GetValue()) {
-        if(getModConfig().CrashOnPlay.GetValue()) {
-            Crash();
-        }
-        if(getModConfig().CrashOnNoFailOn.GetValue()) {
-            if(gameplayModifiers->noFailOn0Energy) Crash();
-        }
+        if(getModConfig().CrashOnPlay.GetValue() || getModConfig().CrashOnNoFailOn.GetValue() && gameplayModifiers->noFailOn0Energy) Crash();
     }
 }
 
 MAKE_HOOK_OFFSETLESS(PlayerTransforms_Update, void, PlayerTransforms* self) {
     PlayerTransforms_Update(self);
-    if(getModConfig().Active.GetValue()) {
-        if(getModConfig().CrashOnTurn.GetValue()) {
-            getLogger().info("Current y turn: " + std::to_string(self->headWorldRot.get_eulerAngles().y));
-            if(self->headWorldRot.get_eulerAngles().y > 165 && self->headWorldRot.get_eulerAngles().y < 195) {
-                Crash();
-            }
-            
-        }
-    }
+    if(getModConfig().Active.GetValue() && getModConfig().CrashOnTurn.GetValue() && self->headWorldRot.get_eulerAngles().y > 165 && self->headWorldRot.get_eulerAngles().y < 195) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(PauseController_HandleMenuButtonTriggered, void, PauseController* self) {
     PauseController_HandleMenuButtonTriggered(self);
-    if(getModConfig().Active.GetValue()) {
-        if(getModConfig().CrashOnPause.GetValue()) {
-            Crash();
-        }
-    }
-    
+    if(getModConfig().Active.GetValue() && getModConfig().CrashOnPause.GetValue()) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(PauseController_HandlePauseMenuManagerDidFinishResumeAnimation, void, PauseController* self) {
     PauseController_HandlePauseMenuManagerDidFinishResumeAnimation(self);
-    if(getModConfig().Active.GetValue()) {
-        if(getModConfig().CrashOnUnpause.GetValue()) {
-            Crash();
-        }
-    }
+    if(getModConfig().Active.GetValue() && getModConfig().CrashOnUnpause.GetValue()) Crash();
 }
 
 MAKE_HOOK_OFFSETLESS(SceneManager_ActiveSceneChanged, void, UnityEngine::SceneManagement::Scene previousActiveScene, UnityEngine::SceneManagement::Scene nextActiveScene) {
     SceneManager_ActiveSceneChanged(previousActiveScene, nextActiveScene);
     if(getModConfig().Active.GetValue() && getModConfig().CrashOnOver5PerBattery.GetValue() && GlobalNamespace::OVRPlugin::OVRP_1_1_0::ovrp_GetSystemBatteryLevel() > getModConfig().BatteryThreshold.GetValue() / 100) Crash();
 }
 
+MAKE_HOOK_OFFSETLESS(ResultsViewController_Init, void, ResultsViewController* self, LevelCompletionResults* result, IDifficultyBeatmap* beatmap, bool practice, bool newHighScore) {
+    ResultsViewController_Init(self, result, beatmap, practice, newHighScore);
+    if(getModConfig().Active.GetValue() && ((getModConfig().CrashOnNotFullCombo.GetValue() && !result->fullCombo) || (getModConfig().CrashOnNewHighscore.GetValue() && self->newHighScore))) Crash();
+}
+
 extern "C" void setup(ModInfo& info) {
     info.id = ID;
     info.version = VERSION;
@@ -156,6 +123,7 @@ extern "C" void load() {
     INSTALL_HOOK_OFFSETLESS(logger, RelativeScoreAndImmediateRankCounter_UpdateRelativeScoreAndImmediateRank, il2cpp_utils::FindMethodUnsafe("", "RelativeScoreAndImmediateRankCounter", "UpdateRelativeScoreAndImmediateRank", 4));
     INSTALL_HOOK_OFFSETLESS(logger, StandardLevelScenesTransitionSetupDataSO_Init, il2cpp_utils::FindMethodUnsafe("", "StandardLevelScenesTransitionSetupDataSO", "Init", 10));
     INSTALL_HOOK_OFFSETLESS(logger, SceneManager_ActiveSceneChanged, il2cpp_utils::FindMethodUnsafe("UnityEngine.SceneManagement", "SceneManager", "Internal_ActiveSceneChanged", 2));
+    INSTALL_HOOK_OFFSETLESS(logger, ResultsViewController_Init, il2cpp_utils::FindMethodUnsafe("", "ResultsViewController", "Init", 4));
     //INSTALL_HOOK_OFFSETLESS(logger, PauseController_HandleMenuButtonTriggered, il2cpp_utils::FindMethodUnsafe("", "PauseController", "HandleMenuButtonTriggered", 0));
     //INSTALL_HOOK_OFFSETLESS(logger, PauseController_HandlePauseMenuManagerDidFinishResumeAnimation, il2cpp_utils::FindMethodUnsafe("", "PauseController", "HandlePauseMenuManagerDidFinishResumeAnimation", 0));
     getLogger().info("Installed all hooks!");