Skip to content

Commit

Permalink
Fix compatibility issues with Webfishing+
Browse files Browse the repository at this point in the history
  • Loading branch information
neomoth committed Oct 29, 2024
1 parent 237e447 commit 19732ff
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
1 change: 0 additions & 1 deletion NeoQOLPack/Mod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public Mod(IModInterface modInterface) {
modInterface.RegisterScriptMod(new InventoryPactcher(this));
modInterface.RegisterScriptMod(new ItemSelectPatcher(this));
modInterface.RegisterScriptMod(new PlayerPatcher(this));
// modInterface.RegisterScriptMod(new PlayerTitlePatcher());
modInterface.RegisterScriptMod(new ShopPatcher());
modInterface.RegisterScriptMod(new PlayerHudPatcher(this));
modInterface.RegisterScriptMod(new ShopButtonPatcher(this));
Expand Down
5 changes: 4 additions & 1 deletion NeoQOLPack/Mods/MenuPatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public IEnumerable<Token> Modify(string path, IEnumerable<Token> tokens)
if (extendsWaiter.Check(token))
{
yield return token;
if (mod.modInterface.LoadedMods.Contains("WebfishingPlus")) continue;
yield return new Token(TokenType.PrVar);
yield return new IdentifierToken("offline_selected");
yield return new Token(TokenType.OpAssign);
Expand Down Expand Up @@ -123,6 +124,7 @@ public IEnumerable<Token> Modify(string path, IEnumerable<Token> tokens)
yield return new ConstantToken(new StringVariant(version));
yield return new Token(TokenType.ParenthesisClose);
yield return new Token(TokenType.Newline, 1);
if (mod.modInterface.LoadedMods.Contains("WebfishingPlus")) continue;
yield return new Token(TokenType.Dollar);
yield return new ConstantToken(new StringVariant("%serv_options"));
yield return new Token(TokenType.Period);
Expand All @@ -139,12 +141,13 @@ public IEnumerable<Token> Modify(string path, IEnumerable<Token> tokens)
else if (buttonWaiter.Check(token))
{
yield return token;
if (mod.modInterface.LoadedMods.Contains("WebfishingPlus")) continue;
yield return new Token(TokenType.ParenthesisOpen);
}
else if (disabledWaiter.Check(token))
{
yield return token;

if (mod.modInterface.LoadedMods.Contains("WebfishingPlus")) continue;
yield return new Token(TokenType.ParenthesisClose);
yield return new Token(TokenType.OpAnd);
yield return new Token(TokenType.OpNot);
Expand Down
2 changes: 1 addition & 1 deletion NeoQOLPack/mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "NeoQOLPack",
"version": "1.0.3",
"version": "1.0.4",
"description": "A collection of Quality of Life patches",
"author": "neomoth"
}
6 changes: 0 additions & 6 deletions mod.json

This file was deleted.

0 comments on commit 19732ff

Please sign in to comment.