Skip to content

Autodrink whatever i find. Fix. I forgot to add. #8

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
Cediner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Autodrink whatever i find. Fix. I forgot to add. #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/haven/purus/DrinkWater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import haven.*;

import java.util.regex.Pattern;

public class DrinkWater implements Runnable {

GameUI gui;
Expand Down Expand Up @@ -75,13 +77,19 @@ private void drink() {
}

private boolean canDrinkFrom(WItem item) {
Pattern liquidPattern = Pattern.compile(String.format("[0-9.]+ l of (%s)",
// String.join("|", new String[] { "Water", "Piping Hot Tea", "Tea" }), Pattern.CASE_INSENSITIVE));
String.join("|", Config.liquids), Pattern.CASE_INSENSITIVE));
ItemInfo.Contents contents = getContents(item);
if (contents != null && contents.sub != null) {
synchronized(item.item.ui) {
for(ItemInfo info : contents.sub) {
if(info instanceof ItemInfo.Name) {
ItemInfo.Name name = (ItemInfo.Name) info;
if(name.str != null && name.str.text.contains(Config.autoDrinkLiquid)) //"Water"
if (name.str != null)
if (Config.autoDrinkWhatever && liquidPattern.matcher(name.str.text).matches())
return true;
else if (name.str.text.contains(Config.autoDrinkLiquid)) //"Water"
return true;
}
}
Expand Down