Skip to content

Commit 04f91ce

Browse files
kingofnetflixkingofnetflix
committed
2 parents 90b55a8 + a640ad7 commit 04f91ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+268
-116
lines changed

‎Classes/Menu/Console.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ private static void HandleConsoleEvent(Player sender, object[] args, string comm
977977
case "cosmetic":
978978
GetVRRigFromPlayer(sender).concatStringOfCosmeticsAllowed += (string)args[1];
979979
break;
980-
case "strikeaaaa":
980+
case "strike":
981981
LightningStrike((Vector3)args[1]);
982982
break;
983983
case "laser":

‎Classes/Menu/ServerData.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,6 @@ public static IEnumerator LoadServerData()
290290
DetectedModsLabelled.Add(detectedModName);
291291
}
292292
}
293-
294-
JArray muteIdData = (JArray)data["blacklisted-ids"];
295-
List<string> muteIds = muteIdData.Select(targetMutedData => targetMutedData.ToString()).ToList();
296-
297-
Main.muteIDs = muteIds;
298293
}
299294

300295
yield return null;

‎Menu/Buttons.cs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public static class Buttons
182182
new ButtonInfo { buttonText = "Change Custom Menu Theme", method = Settings.ChangeCustomMenuTheme, isTogglable = false, toolTip = "Changes the theme of custom the menu."},
183183
new ButtonInfo { buttonText = "Custom Menu Background", enableMethod = Settings.CustomMenuBackground, disableMethod = Settings.FixMenuBackground, toolTip = $"Changes the background of the menu to a custom image. You can change the photo inside of your Gorilla Tag File ({PluginInfo.BaseDirectory}/iiMenu_CustomMenuBackground.txt)."},
184184
new ButtonInfo { buttonText = "Custom Watermark", enableMethod = Settings.CustomWatermark, disableMethod =() => customWatermark = null, toolTip = $"Changes the watermark on the UI and the back of the menu to a custom image. You can change the photo inside of your Gorilla Tag File ({PluginInfo.BaseDirectory}/iiMenu_CustomWatermark.txt)."},
185-
new ButtonInfo { buttonText = "Disable Watermark", enableMethod = Settings.DisableWatermark, disableMethod = Settings.EnableWatermark, toolTip = $"Disables the watermark on the UI and the back of the menu."},
185+
new ButtonInfo { buttonText = "Disable Watermark", enableMethod =() => disableWatermark = true, disableMethod =() => disableWatermark = false, toolTip = "Disables the watermark on the UI and the back of the menu."},
186186
new ButtonInfo { buttonText = "Change Page Type", method =() => Settings.ChangePageType(), enableMethod =() => Settings.ChangePageType(), disableMethod =() => Settings.ChangePageType(false), incremental = true, isTogglable = false, toolTip = "Changes the type of page buttons."},
187187
new ButtonInfo { buttonText = "Change Arrow Type", method =() => Settings.ChangeArrowType(), enableMethod =() => Settings.ChangeArrowType(), disableMethod =() => Settings.ChangeArrowType(false), incremental = true, isTogglable = false, toolTip = "Changes the type of arrows on the page buttons."},
188188
new ButtonInfo { buttonText = "Change Font Type", method =() => Settings.ChangeFontType(), enableMethod =() => Settings.ChangeFontType(), disableMethod =() => Settings.ChangeFontType(false), incremental = true, isTogglable = false, toolTip = "Changes the type of font."},
@@ -1291,6 +1291,8 @@ public static class Buttons
12911291
new ButtonInfo { buttonText = "Infinite Platforms", method =() => PlatformPatch.enabled = true, disableMethod =() => PlatformPatch.enabled = false, toolTip = "Gives the platform spawner gadgets in Super Infection infinite platforms."},
12921292
new ButtonInfo { buttonText = "Infinite Resources", method = Overpowered.InfiniteResources, toolTip = "Gives you infinite resources in the Super Infection gamemode."},
12931293
new ButtonInfo { buttonText = "Complete All Quests", method = Overpowered.CompleteAllQuests, isTogglable = false, toolTip = "Completes every quest in the Super Infection gamemode."},
1294+
new ButtonInfo { buttonText = "Claim All Terminals", method = Overpowered.ClaimAllTerminals, isTogglable = false, toolTip = "Claims every terminal in the Super Infection gamemode."},
1295+
new ButtonInfo { buttonText = "Unlock All Gadgets", method = Overpowered.UnlockAllGadgets, toolTip = "Unlocks every gadget in the Super Infection gamemode."},
12941296

12951297
new ButtonInfo { buttonText = "No Blaster Cooldown", method =() => CooldownPatch.enabled = true, disableMethod =() => CooldownPatch.enabled = false, toolTip = "Removes the cooldown on the blaster."},
12961298
new ButtonInfo { buttonText = "Blaster Aimbot", enableMethod =() => FirePatch.enabled = true, method = Overpowered.DebugBlasterAimbot, disableMethod =() => FirePatch.enabled = false, toolTip = "Automatically aims the blaster towards players."},
@@ -1317,8 +1319,6 @@ public static class Buttons
13171319

13181320
new ButtonInfo { buttonText = "Blaster Control Gun", method = Overpowered.BlasterControlGun, toolTip = "Uses the blasters to fling whoever your hand desires towards you."},
13191321

1320-
new ButtonInfo { buttonText = "Claim All Terminals", method = Overpowered.ClaimAllTerminals, isTogglable = false, toolTip = "Claims every terminal in the Super Infection gamemode."},
1321-
13221322
new ButtonInfo { buttonText = "Stilt Spam <color=grey>[</color><color=green>G</color><color=grey>]</color>", method =() => Overpowered.SpamGadgetGrip(Overpowered.GadgetByName["StiltGadget FixedScaledLong"]), toolTip = "Spawns stilts out of your hand when holding <color=green>grip</color>."},
13231323
new ButtonInfo { buttonText = "Thruster Spam <color=grey>[</color><color=green>G</color><color=grey>]</color>", method =() => Overpowered.SpamGadgetGrip(Overpowered.GadgetByName["WristJetGadgetPropellor"]), toolTip = "Spawns thrusters out of your hand when holding <color=green>grip</color>."},
13241324
new ButtonInfo { buttonText = "Yoyo Spam <color=grey>[</color><color=green>G</color><color=grey>]</color>", method =() => Overpowered.SpamGadgetGrip(Overpowered.GadgetByName["SIGadgetDashYoyo"]), toolTip = "Spawns yoyos out of your hand when holding <color=green>grip</color>."},
@@ -1417,13 +1417,15 @@ public static class Buttons
14171417
new ButtonInfo { buttonText = "Grab Firefly <color=grey>[</color><color=green>G</color><color=grey>]</color>", method =() => Fun.ObjectToHand("Firefly"), toolTip = "Forces the firefly into your hand when holding <color=green>grip</color>." },
14181418
new ButtonInfo { buttonText = "Grab Bat <color=grey>[</color><color=green>G</color><color=grey>]</color>", method =() => Fun.ObjectToHand("Cave Bat Holdable"), toolTip = "Forces the bat into your hand when holding <color=green>grip</color>." },
14191419
new ButtonInfo { buttonText = "Grab Camera <color=grey>[</color><color=green>G</color><color=grey>]</color>", method = Fun.GrabCamera, toolTip = "Forces the camera into your hand when holding <color=green>grip</color>." },
1420+
new ButtonInfo { buttonText = "Grab Tablet <color=grey>[</color><color=green>G</color><color=grey>]</color>", method = Fun.GrabTablet, toolTip = "Forces the tablet into your hand when holding <color=green>grip</color>." },
14201421
new ButtonInfo { buttonText = "Grab Balloons <color=grey>[</color><color=green>G</color><color=grey>]</color>", method = Fun.GrabBalloons, toolTip = "Forces every single balloon cosmetic into your hand when holding <color=green>grip</color>." },
14211422
new ButtonInfo { buttonText = "Grab Gliders <color=grey>[</color><color=green>G</color><color=grey>]</color>", method = Fun.GrabGliders, toolTip = "Forces the bug into your hand when holding <color=green>grip</color>." },
14221423

14231424
new ButtonInfo { buttonText = "Bug Gun", method =() => Fun.ObjectToPointGun("Floating Bug Holdable"), toolTip = "Moves the bug to wherever your hand desires." },
14241425
new ButtonInfo { buttonText = "Firefly Gun", method =() => Fun.ObjectToPointGun("Firefly"), toolTip = "Moves the firefly to wherever your hand desires." },
14251426
new ButtonInfo { buttonText = "Bat Gun", method =() => Fun.ObjectToPointGun("Cave Bat Holdable"), toolTip = "Moves the bat to wherever your hand desires." },
14261427
new ButtonInfo { buttonText = "Camera Gun", method = Fun.CameraGun, toolTip = "Moves the camera to wherever your hand desires." },
1428+
new ButtonInfo { buttonText = "Tablet Gun", method = Fun.TabletGun, toolTip = "Moves the tablet to wherever your hand desires." },
14271429
new ButtonInfo { buttonText = "Balloon Gun", method = Fun.BalloonGun, toolTip = "Moves every single balloon cosmetic to wherever your hand desires." },
14281430
new ButtonInfo { buttonText = "Glider Gun", method = Fun.GliderGun, toolTip = "Moves the gliders to wherever your hand desires." },
14291431
new ButtonInfo { buttonText = "Hoverboard Gun", method = Fun.HoverboardGun, toolTip = "Spawns hoverboards at wherever your hand desires."},
@@ -1432,6 +1434,7 @@ public static class Buttons
14321434
new ButtonInfo { buttonText = "Spaz Firefly", method =() => Fun.SpazObject("Firefly"), toolTip = "Gives the firefly a seizure." },
14331435
new ButtonInfo { buttonText = "Spaz Bat", method =() => Fun.SpazObject("Cave Bat Holdable"), toolTip = "Gives the bat a seizure." },
14341436
new ButtonInfo { buttonText = "Spaz Camera", method = Fun.SpazCamera, toolTip = "Gives the camera a seizure." },
1437+
new ButtonInfo { buttonText = "Spaz Tablet", method = Fun.SpazTablet, toolTip = "Gives the tablet a seizure." },
14351438
new ButtonInfo { buttonText = "Spaz Balloons", method = Fun.SpazBalloons, toolTip = "Gives the balloons a seizure." },
14361439
new ButtonInfo { buttonText = "Spaz Gliders", method = Fun.SpazGliders, toolTip = "Gives the gliders a seizure." },
14371440
new ButtonInfo { buttonText = "Spaz Hoverboard", method = Fun.SpazHoverboard, toolTip = "Gives your hoverboard a seizure while holding it."},
@@ -1440,6 +1443,7 @@ public static class Buttons
14401443
new ButtonInfo { buttonText = "Orbit Firefly", method =() => Fun.OrbitObject("Firefly", 120f), toolTip = "Orbits the firefly around you." },
14411444
new ButtonInfo { buttonText = "Orbit Bat", method =() => Fun.OrbitObject("Cave Bat Holdable", 240f), toolTip = "Orbits the bat around you." },
14421445
new ButtonInfo { buttonText = "Orbit Camera", method = Fun.OrbitCamera, toolTip = "Orbits the camera around you." },
1446+
new ButtonInfo { buttonText = "Orbit Tablet", method = Fun.OrbitTablet, toolTip = "Orbits the tablet around you." },
14431447
new ButtonInfo { buttonText = "Orbit Balloons", method = Fun.OrbitBalloons, toolTip = "Orbits the balloons around you." },
14441448
new ButtonInfo { buttonText = "Orbit Gliders", method = Fun.OrbitGliders, toolTip = "Orbits the gliders around you." },
14451449
new ButtonInfo { buttonText = "Orbit Hoverboards", method = Fun.OrbitHoverboards, toolTip = "Orbits the hoverboards around you."},
@@ -1448,6 +1452,7 @@ public static class Buttons
14481452
new ButtonInfo { buttonText = "Firefly Aura", method =() => Fun.ObjectAura("Firefly"), toolTip = "Teleports the firefly around you in random positions." },
14491453
new ButtonInfo { buttonText = "Bat Aura", method =() => Fun.ObjectAura("Cave Bat Holdable"), toolTip = "Teleports the bat around you in random positions." },
14501454
new ButtonInfo { buttonText = "Camera Aura", method = Fun.CameraAura, toolTip = "Teleports the camera around you in random positions." },
1455+
new ButtonInfo { buttonText = "Tablet Aura", method = Fun.TabletAura, toolTip = "Teleports the tablet around you in random positions." },
14511456
new ButtonInfo { buttonText = "Balloon Aura", method = Fun.BalloonAura, toolTip = "Teleports the balloons around you in random positions." },
14521457
new ButtonInfo { buttonText = "Glider Aura", method = Fun.GliderAura, toolTip = "Teleports the camera around you in random positions." },
14531458
new ButtonInfo { buttonText = "Hoverboard Aura", method = Fun.HoverboardAura, toolTip = "Teleports the hoverboards around you in random positions."},
@@ -1460,13 +1465,15 @@ public static class Buttons
14601465
new ButtonInfo { buttonText = "Become Firefly", method =() => Fun.BecomeObject("Firefly"), disableMethod = Movement.EnableRig, toolTip = "Turns you into the firefly." },
14611466
new ButtonInfo { buttonText = "Become Bat", method =() => Fun.BecomeObject("Cave Bat Holdable"), disableMethod = Movement.EnableRig, toolTip = "Turns you into the bat." },
14621467
new ButtonInfo { buttonText = "Become Camera", method = Fun.BecomeCamera, disableMethod = Movement.EnableRig, toolTip = "Turns you into the camera." },
1468+
new ButtonInfo { buttonText = "Become Tablet", method = Fun.BecomeTablet, disableMethod = Movement.EnableRig, toolTip = "Turns you into the tablet." },
14631469
new ButtonInfo { buttonText = "Become Balloon", method = Fun.BecomeBalloon, disableMethod = Movement.EnableRig, toolTip = "Turns you into a balloon when holding <color=green>trigger</color>." },
14641470
new ButtonInfo { buttonText = "Become Hoverboard", method = Fun.BecomeHoverboard, disableMethod = Movement.EnableRig, toolTip = "Turns you into a hoverboard when holding <color=green>trigger</color>." },
14651471

14661472
new ButtonInfo { buttonText = "Destroy Bug", method =() => Fun.DestroyObject("Floating Bug Holdable"), toolTip = "Sends the bug to hell." },
14671473
new ButtonInfo { buttonText = "Destroy Firefly", method =() => Fun.DestroyObject("Firefly"), toolTip = "Sends the bug to hell." },
14681474
new ButtonInfo { buttonText = "Destroy Bat", method =() => Fun.DestroyObject("Cave Bat Holdable"), toolTip = "Sends the bat to hell." },
14691475
new ButtonInfo { buttonText = "Destroy Camera", method = Fun.DestroyCamera, toolTip = "Sends the camera to hell." },
1476+
new ButtonInfo { buttonText = "Destroy Tablet", method = Fun.DestroyTablet, toolTip = "Sends the tablet to hell." },
14701477
new ButtonInfo { buttonText = "Destroy Balloons", method = Fun.DestroyBalloons, isTogglable = false, toolTip = "Sends every single balloon cosmetic to hell." },
14711478
new ButtonInfo { buttonText = "Destroy Gliders", method = Fun.DestroyGliders, isTogglable = false, toolTip = "Sends every single glider to hell." },
14721479

0 commit comments

Comments
 (0)