Skip to content
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

Jump to bottom

Merge from master #8

Merged
merged 1 commit into from
Apr 8, 2018
Merged

Merge from master #8

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion PROBot/BotClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public bool TalkToNpc(Npc target)
bool canInteract = Game.Map.CanInteract(Game.PlayerX, Game.PlayerY, target.PositionX, target.PositionY);
if (canInteract)
{
Game.TalkToNpc(target.Id);
Game.TalkToNpc(target);
return true;
}
else
Expand Down
8 changes: 5 additions & 3 deletions PROProtocol/GameClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ private void UpdateNpcBattle()
_npcBattleTimeout.Update();
if (_npcBattleTimeout.IsActive) return;

TalkToNpc(_npcBattler.Id);
TalkToNpc(_npcBattler);
_npcBattler = null;
}

Expand Down Expand Up @@ -893,9 +893,11 @@ public void ChangePokemon(int number)
UseAttack(number + 5);
}

public void TalkToNpc(int id)
public void TalkToNpc(Npc npc)
{
SendTalkToNpc(id);
npc.CanBattle = false;

SendTalkToNpc(npc.Id);
_dialogTimeout.Set();
}

Expand Down