diff --git a/.gitignore b/.gitignore index 516e5bdae..f68b091a2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,9 @@ assets/LoadingScreens/*.psd /zig-out/ /.zig-cache/ /zig-pkg/ + +# older build artifacts +/mods/ +/.xmake/ +/vsxmake2022/ +/zig-build-error.log diff --git a/assets/LoadingScreens/M96 Loading Screen.jpg b/assets/LoadingScreens/M96 Loading Screen.jpg new file mode 100644 index 000000000..a70ac8efd Binary files /dev/null and b/assets/LoadingScreens/M96 Loading Screen.jpg differ diff --git a/assets/loadingscreen.png b/assets/loadingscreen.png index 48f38d6ed..a70ac8efd 100644 Binary files a/assets/loadingscreen.png and b/assets/loadingscreen.png differ diff --git a/build.zig b/build.zig index 4f9856bf5..07f10e879 100644 --- a/build.zig +++ b/build.zig @@ -37,8 +37,7 @@ pub fn build(b: *std.Build) void { .default_target = .{ .abi = if (builtin.os.tag == .windows) .msvc else null }, }); // Local builds should behave like the shipped mod while retaining symbols for crash reports and debuggers. - const optimize = b.option(std.builtin.OptimizeMode, "optimize", "Prioritize performance, safety, or binary size") - orelse .ReleaseFast; + const optimize = b.option(std.builtin.OptimizeMode, "optimize", "Prioritize performance, safety, or binary size") orelse .ReleaseFast; const options = Options.parse(b); mod.addUniversal(b, optimize, options); const ctx = Ctx.init(b, target, optimize, options); diff --git a/src/mod/game/app.h b/src/mod/game/app.h index 3a43a331f..9f3391737 100644 --- a/src/mod/game/app.h +++ b/src/mod/game/app.h @@ -267,38 +267,26 @@ struct TutorialMaskUILoader : unity::Behaviour { using Class = il2cpp::Class<"Assembly-CSharp", "Digit.Prime.Tutorial", "TutorialMaskUILoader">; unity::Behaviour* Controller() - { - return Get<"Controller", unity::Behaviour*>(); - } + { return Get<"Controller", unity::Behaviour*>(); } }; struct TutorialManager : il2cpp::Object { using Class = il2cpp::Class<"Assembly-CSharp", "Digit.Prime.Tutorial", "TutorialManager">; static bool Active() - { - return Class::Field<"_isActive", bool>(); - } + { return Class::Field<"_isActive", bool>(); } static void SetActive(bool active) - { - Class::SetField<"_isActive">(active); - } + { Class::SetField<"_isActive">(active); } static bool BlockingInput() - { - return Class::Field<"_isBlockingInput", bool>(); - } + { return Class::Field<"_isBlockingInput", bool>(); } static void SetBlockingInput(bool blocked) - { - Class::SetField<"_isBlockingInput">(blocked); - } + { Class::SetField<"_isBlockingInput">(blocked); } TutorialMaskUILoader* loadAndShow() - { - return Field<"_loadAndShow", TutorialMaskUILoader*>(); - } + { return Field<"_loadAndShow", TutorialMaskUILoader*>(); } }; // TouchKit's global pointer-input gate. Tutorials hold it while only their highlighted control may receive input. @@ -306,14 +294,10 @@ struct TouchKit { using Class = il2cpp::Class<"TouchKit", "", "TouchKit">; static bool BlockTouch() - { - return Class::Field<"BlockTouch", bool>(); - } + { return Class::Field<"BlockTouch", bool>(); } static void SetBlockTouch(bool blocked) - { - Class::SetField<"BlockTouch">(blocked); - } + { Class::SetField<"BlockTouch">(blocked); } }; // Fabric.EventManager, the game's sound middleware. Its shorter PostEvent overloads funnel into the