ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

kourendlibrary: Don't reset state when not finding Varlamore Envoy

Browse Source 
The Varlamore Envoy is a quest item which, while having a known location
in the library once a rotation is determined, cannot be found under
certain circumstances. (when the Depths of Despair quest has not been
started, has been collected while completing the quest, and after the
quest is completed) Previously searching a bookcase which could contain
this book and not finding it would cause a state reset. This commit
keeps those null finds from resetting the known library state.
This commit is contained in:
Jordan Atwood
2020-10-08 13:53:58 -07:00
parent d19405129a
commit d0589c80b9
2 changed files with 85 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
View File

@@ -122,8 +122,9 @@ class Library
if (bookcase.isBookSet())
{
// Bookcase is set from a previous mark
// Check for a mismatch, unless it is now null and had a dark manuscript
if (book != bookcase.getBook() && !(book == null && bookcase.getBook().isDarkManuscript()))
// Check for a mismatch, unless it is now null and had a dark manuscript or Varlamore Envoy
if (book != bookcase.getBook()
&& !(book == null && (bookcase.getBook().isDarkManuscript() || bookcase.getBook() == VARLAMORE_ENVOY)))
{
reset();
}
@@ -140,8 +141,11 @@ class Library
if (state == SolvedState.COMPLETE)
{
// Reset if we found nothing when we expected something that wasn't a Dark Manuscript, since the layout has changed
if (book == null && !bookcase.getPossibleBooks().isEmpty() && bookcase.getPossibleBooks().stream().noneMatch(Book::isDarkManuscript))
// Reset if we found nothing when we expected something that wasn't a Dark Manuscript or Varlamore Envoy
// since the layout has changed
if (book == null
&& !bookcase.getPossibleBooks().isEmpty()
&& bookcase.getPossibleBooks().stream().noneMatch(b -> b.isDarkManuscript() || b == VARLAMORE_ENVOY))
{
reset();
}

77
runelite-client/src/test/java/net/runelite/client/plugins/kourendlibrary/LibraryTest.java Normal file
View File

@@ -0,0 +1,77 @@
/*
* Copyright (c) 2020 Jordan Atwood <nightfirecat@protonmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.kourendlibrary;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.testing.fieldbinder.BoundFieldModule;
import net.runelite.api.coords.WorldPoint;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
public class LibraryTest
{
@Inject
private Library library;
@Before
public void before()
{
Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
}
@Test
public void testVarlamoreEnvoyFindingProcess()
{
library.mark(new WorldPoint(1610, 3799, 1), null);
library.mark(new WorldPoint(1608, 3799, 1), null);
library.mark(new WorldPoint(1615, 3799, 1), null);
library.mark(new WorldPoint(1616, 3799, 1), null);
library.mark(new WorldPoint(1621, 3799, 1), null);
library.mark(new WorldPoint(1624, 3796, 1), null);
library.mark(new WorldPoint(1624, 3792, 1), null);
library.mark(new WorldPoint(1624, 3791, 1), null);
library.mark(new WorldPoint(1623, 3789, 1), null);
assertEquals(SolvedState.NO_DATA, library.getState());
library.mark(new WorldPoint(1621, 3789, 1), Book.WINTERTODT_PARABLE);
assertEquals(SolvedState.INCOMPLETE, library.getState());
library.mark(new WorldPoint(1618, 3799, 2), null);
library.mark(new WorldPoint(1613, 3792, 2), null);
library.mark(new WorldPoint(1618, 3790, 2), Book.TRANSPORTATION_INCANTATIONS);
library.mark(new WorldPoint(1609, 3816, 2), Book.RICKTORS_DIARY_7);
assertEquals(SolvedState.COMPLETE, library.getState());
// The Varlamore Envoy book can be found in this bookcase, but should not cause a state reset if not found
library.mark(new WorldPoint(1622, 3816, 2), null);
assertEquals(SolvedState.COMPLETE, library.getState());
}
}