Skip to content

fix: Phials chat #46

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

Merged
Torwent merged 1 commit into from
Dec 13, 2025
Merged

fix: Phials chat #46

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
21 changes: 11 additions & 10 deletions wasp_builder.simba
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ type
LastPoint: TPoint;
end;


procedure TBuilder.SetupNPC();
begin
case CurrentNPC of
Expand Down Expand Up @@ -189,7 +188,6 @@ begin
Self.MinPlankCount;
end;


function TBuilder.EnterHouse(): Boolean;
var
portalOpen: Boolean;
Expand Down Expand Up @@ -258,7 +256,6 @@ begin
Self.LastPoint := [0,0];
end;


function TBuilder.CallServant(): Boolean;
begin
if Self.ServantNPC.Click() then
Expand All @@ -280,7 +277,7 @@ begin
RSNPCs.Phials.SelectOption(['Use']) then
begin
Minimap.WaitFlag();
Result := WaitUntil('Exchange' in Chat.GetChatTitle(), 100, 15000);
Result := WaitUntil(Pos('Exchange', Chat.GetChatTitle()) > 0, 100, 15000)
end;
end;

Expand All @@ -295,7 +292,6 @@ begin
Self.WaitingServant := not Result;
end;


function TBuilder.FillSack(attempt: Int32 = 0): Boolean;
var
count: Int32;
Expand All @@ -316,7 +312,6 @@ begin
Exit(Self.FillSack(attempt + 1));
end;


function TBuilder.HandleServant(): Boolean;
begin
Result := Chat.ClickOption('Fetch', BioHash);
Expand Down Expand Up @@ -397,7 +392,8 @@ function TBuilder.HandlePhialsChat(): Boolean;
var
slot: Int32;
begin
Result := Chat.ClickOption('All');
Result := Chat.ClickOption('All', True);

if Result then
begin
if Self.UsePlankSack and (Self.PlankSackCount < Self.MinPlankCount) then
Expand All @@ -411,7 +407,6 @@ begin
end;
end;


function TBuilder.GetState(): EBuilderState;
var
s: String;
Expand All @@ -430,11 +425,13 @@ begin
if s.Contains('remove') then
Exit(EBuilderState.HANDLE_BUILD_CHAT);

if s.Contains('Exchange') then
Exit(EBuilderState.HANDLE_PHIALS_CHAT);

if s.Contains('Select') then
begin
if 'house' in Chat.GetChat() then
Exit(EBuilderState.ENTER_HOUSE);
Exit(EBuilderState.HANDLE_PHIALS_CHAT);
end;

if s.Contains('Repeat') then
Expand Down Expand Up @@ -693,9 +690,13 @@ begin
);

1: Self.BuilderInfo.SetCaption(
'Make sure to have a Bell-pull in your dining room and a ' +
LineEnding +
'Servant''s money bag in your south bedroom if using a butler.' +
LineEnding + LineEnding +
'Make sure you have planks in your bank and you have previously' +
LineEnding +
'asked the buttler to fetch you 24 planks.' +
'asked the butler to fetch you 24 planks.' +
LineEnding + LineEnding +
'You also need money in your servant''s money bag and you need to' +
LineEnding +
Expand Down
Loading