Skip to content

5e Cone Area of Effect on Square Grid: "Template/Stencil" Method #4588

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

Draft
wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

5e Cone Area of Effect on Square Grid: "Template/Stencil" Method #4588

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
f4f10fc
Add RightAngleConeTemplate and Tool classes.
mal-w Jul 1, 2023
6265048
Fix issue with squares being left out
mal-w Dec 30, 2023
0f07491
Remove unused method getPathIterator
mal-w Dec 30, 2023
d2601a9
Refactor to TriangleTemplate and add sensitivity parameter
mal-w Dec 30, 2023
17481bc
Add Triangle Template icon and update Cone Icon. Update tooltips.
mal-w Dec 30, 2023
9666847
Add performance testing for AffineTransform change
mal-w Jan 2, 2024
3c31af4
Merge branch 'develop' into feature/right-angle-cone-templates
cwisniew Feb 3, 2024
64850a6
Select more efficient getConePathMethod
mal-w Feb 3, 2024
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
456 changes: 456 additions & 0 deletions src/main/java/net/rptools/maptool/client/tool/drawing/TriangleTemplateTool.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/main/java/net/rptools/maptool/client/ui/ToolbarPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,9 @@ private OptionPanel createTemplatePanel() {
panel
.add(WallTemplateTool.class)
.setIcon(RessourceManager.getBigIcon(Icons.TOOLBAR_TEMPLATE_WALL));
panel
.add(TriangleTemplateTool.class)
.setIcon(RessourceManager.getBigIcon(Icons.TOOLBAR_TEMPLATE_TRIANGLE));
return panel;
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/rptools/maptool/client/ui/theme/Icons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ public enum Icons {
TOOLBAR_TEMPLATE_RADIUS,
TOOLBAR_TEMPLATE_RADIUS_CELL,
TOOLBAR_TEMPLATE_WALL,
TOOLBAR_TEMPLATE_TRIANGLE,
TOOLBAR_TOKENSELECTION_ALL_OFF,
TOOLBAR_TOKENSELECTION_ALL_ON,
TOOLBAR_TOKENSELECTION_ME_OFF,
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/theme/RessourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,14 @@ public class RessourceManager {
put(
Icons.TOOLBAR_TEMPLATE_LINE_CELL,
ROD_ICONS + "ribbon/Line Template Centered on Grid.svg");
put(Icons.TOOLBAR_TEMPLATE_OFF, ROD_ICONS + "ribbon/Cone Template.svg");
put(Icons.TOOLBAR_TEMPLATE_ON, ROD_ICONS + "ribbon/Cone Template.svg");
put(Icons.TOOLBAR_TEMPLATE_OFF, ROD_ICONS + "ribbon/Triangle Template.svg");
put(Icons.TOOLBAR_TEMPLATE_ON, ROD_ICONS + "ribbon/Triangle Template.svg");
put(Icons.TOOLBAR_TEMPLATE_RADIUS, ROD_ICONS + "ribbon/Radius Template.svg");
put(
Icons.TOOLBAR_TEMPLATE_RADIUS_CELL,
ROD_ICONS + "ribbon/Radius Template Centered on Grid.svg");
put(Icons.TOOLBAR_TEMPLATE_WALL, ROD_ICONS + "ribbon/Wall Line Template.svg");
put(Icons.TOOLBAR_TEMPLATE_TRIANGLE, ROD_ICONS + "ribbon/Triangle Template.svg");
put(Icons.TOOLBAR_TOKENSELECTION_ALL_OFF, ROD_ICONS + "ribbon/All.svg");
put(Icons.TOOLBAR_TOKENSELECTION_ALL_ON, ROD_ICONS + "ribbon/All.svg");
put(Icons.TOOLBAR_TOKENSELECTION_ME_OFF, ROD_ICONS + "ribbon/Me.svg");
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/net/rptools/maptool/model/drawing/Drawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,20 @@ static Drawable fromDto(DrawableDto drawableDto) {
drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
return drawable;
}
case TRIANGLE_TEMPLATE -> {
var dto = drawableDto.getTriangleTemplate();
var id = GUID.valueOf(dto.getId());
var drawable = new TriangleTemplate(id);
drawable.setZoneId(GUID.valueOf(dto.getZoneId()));
drawable.setRadius(dto.getRadius());
var vertex = dto.getVertex();
drawable.setVertex(new ZonePoint(vertex.getX(), vertex.getY()));
if (dto.hasName()) drawable.setName(dto.getName().getValue());
drawable.setLayer(Zone.Layer.valueOf(dto.getLayer()));
drawable.setTheta(dto.getTheta());
drawable.setSensitivity(dto.getSensitivity());
return drawable;
}
case BURST_TEMPLATE -> {
var dto = drawableDto.getBurstTemplate();
var id = GUID.valueOf(dto.getId());
Expand Down
Loading