Skip to content

Chat: Targeted messages can be sent on Party and DM channels #1116

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
plenarius merged 1 commit into from
Nov 5, 2020
Merged

Chat: Targeted messages can be sent on Party and DM channels #1116

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
https://github.com/nwnxee/unified/compare/build8193.16...HEAD

### Added
- Chat: targeted messages can now be sent on the Party or DM channels
- Events: added skippable Acquire events to ItemEvents
- Events: added skippable Disarm event to CombatEvents
- Events: added `ACTION_RESULT` to Feat/Skill/Lock events for use in the _AFTER
Expand Down
10 changes: 10 additions & 0 deletions Plugins/Chat/Chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ Events::ArgumentStack Chat::SendMessage(Events::ArgumentStack&& args)
messageDispatch->SendServerToPlayerChat_DM_Talk(playerId, speaker, message.c_str());
sentMessage = true;
}
else if (channel == Constants::ChatChannel::DmDm || channel == Constants::ChatChannel::PlayerDm)
{
messageDispatch->SendServerToPlayerChat_DM_Silent_Shout(playerId, speaker, message.c_str());
sentMessage = true;
}
else if (channel == Constants::ChatChannel::PlayerShout || channel == Constants::ChatChannel::DmShout)
{
messageDispatch->SendServerToPlayerChat_Shout(playerId, speaker, message.c_str());
Expand All @@ -236,6 +241,11 @@ Events::ArgumentStack Chat::SendMessage(Events::ArgumentStack&& args)
messageDispatch->SendServerToPlayerChat_DM_Whisper(playerId, speaker, message.c_str());
sentMessage = true;
}
else if (channel == Constants::ChatChannel::PlayerParty || channel == Constants::ChatChannel::DmParty)
{
messageDispatch->SendServerToPlayerChat_Party(playerId, speaker, message.c_str());
sentMessage = true;
}
}

if (!sentMessage)
Expand Down