Skip to content

Making masspickup work without hotkeys if they're unset #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fiote wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Making masspickup work without hotkeys if they're unset #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
131b7dd
Making masspickup work without hotkeys if they're unset
fiote Feb 11, 2024
8b273b2
Bump assembly to 1.10
fiote Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MassFarming/MassFarming.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace MassFarming
{
[BepInPlugin("xeio.MassFarming", "MassFarming", "1.9")]
[BepInPlugin("xeio.MassFarming", "MassFarming", "1.10")]
public class MassFarming : BaseUnityPlugin
{
public static ConfigEntry<KeyboardShortcut> MassActionHotkey { get; private set; }
Expand Down
12 changes: 11 additions & 1 deletion MassFarming/MassPickup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ public static void Prefix(Player __instance, GameObject go, bool hold, bool alt)
return;
}

if (!Input.GetKey(MassFarming.ControllerPickupHotkey.Value.MainKey) && !Input.GetKey(MassFarming.MassActionHotkey.Value.MainKey))
var controllerKey = MassFarming.ControllerPickupHotkey.Value.MainKey;
var controllerKeyEmpty = controllerKey == KeyCode.None;
var controllerPressed = Input.GetKey(controllerKey);
var controllerOk = controllerKeyEmpty || controllerPressed;

var keyboardKey = MassFarming.MassActionHotkey.Value.MainKey;
var keyboardKeyEmpty = keyboardKey == KeyCode.None;
var keyboardPressed = Input.GetKey(keyboardKey);
var keyboardOk = keyboardKeyEmpty || keyboardPressed;

if (!controllerOk && !keyboardOk)
{
//Hotkey required
return;
Expand Down