Refactor shields with common shapes #480
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A much-needed refactor to give common shield shapes a consistent naming scheme.
A new shield definition parameter is introduced,
verticalReflect
, which draws a shield upside-down when set totrue
.This was sort of a prerequisite to #458, since it introduces another convex triangle shield that's just a vertically flipped version of an existing shield. In the future, we may be able to further reduce the size of the sprite sheet by drawing some of these shapes directly with code.
Basic shapes include:
tri_rounded
tri_convex
diamond
trapezoid
trapezoid_rounded
pent
home
hex_horz
hex_vert
oct
badge
In each case, a white shield with a black border is treated as the default color scheme. This black border can be recolored with
colorLighten
. Other color variants are specified by appending the background color first, then the border color. If no second color is specified for the border, white is assumed, except when the background is yellow, in which case a black border is assumed.Additionally, the dimensions of the Malaysian route shield are adjusted to enlarge text and match other shields with similar shapes: