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

Add unique light sources on tokens, and macros for manipulating them. #4356

Merged
merged 8 commits into from
Nov 4, 2023
Merged

Add unique light sources on tokens, and macros for manipulating them. #4356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
937fd76
Make LightSource immutable so they don't need to be cloned.
kwvanderlinde Oct 24, 2023
69c342d
Simplify existing light source system
kwvanderlinde Oct 24, 2023
5a130bf
Implement light sources on tokens
kwvanderlinde Oct 24, 2023
b056c5b
Integrate unique light sources with existing light functions
kwvanderlinde Oct 24, 2023
85b5527
Add macro functions for manipulating unique light sources
kwvanderlinde Oct 27, 2023
b827261
Fix to not hide partially GM-only light sources in the menu
kwvanderlinde Nov 2, 2023
6719636
Remove commented out light sources in LightSourceCreator
kwvanderlinde Nov 2, 2023
29e4660
Document LightSource.lightList regarding the serialization subtleties
kwvanderlinde Nov 2, 2023
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
22 changes: 10 additions & 12 deletions src/main/java/net/rptools/maptool/client/ServerCommandClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,18 +674,16 @@ public void updateTokenProperty(Token token, Token.Update update, String value)

@Override
public void updateTokenProperty(Token token, Token.Update update, LightSource value) {
updateTokenProperty(
token, update, TokenPropertyValueDto.newBuilder().setLightSource(value.toDto()).build());
}

@Override
public void updateTokenProperty(
Token token, Token.Update update, LightSource value1, String value2) {
updateTokenProperty(
token,
update,
TokenPropertyValueDto.newBuilder().setLightSource(value1.toDto()).build(),
TokenPropertyValueDto.newBuilder().setStringValue(value2).build());
if (update == Token.Update.createUniqueLightSource) {
// This case requires sending the full light source definition.
updateTokenProperty(
token, update, TokenPropertyValueDto.newBuilder().setLightSource(value.toDto()).build());
} else {
updateTokenProperty(
token,
update,
TokenPropertyValueDto.newBuilder().setLightSourceId(value.getId().toString()).build());
}
}

@Override
Expand Down
Loading
Loading