Skip to content

Commit 374dac4

Browse files
committed
Change "ternary" to "tertiary"
Ternary means "made up of three things". Tertiary means "of third rank or order".
1 parent 56d3ff5 commit 374dac4

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/entityViewer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ namespace EntityViewer {
120120
["Mass:", car.mass.toString()],
121121
["Acceleration:", car.acceleration.toString()],
122122
["Banking rotation:", car.bankRotation.toString()],
123-
["Colours", `body: ${car.colours.body}, trim: ${car.colours.trim}, ternary: ${car.colours.ternary}`],
123+
["Colours", `body: ${car.colours.body}, trim: ${car.colours.trim}, tertiary: ${car.colours.tertiary}`],
124124
["Powered acceleration:", car.poweredAcceleration.toString()],
125125
["Powered max. speed:", car.poweredMaxSpeed.toString()],
126126
["Status:", car.status.toString()],

src/imageList.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace ImageList {
2626
let secondaryChecked = false;
2727
let primaryColour = 4;
2828
let secondaryColour = 18;
29-
let ternaryColour = 30;
29+
let tertiaryColour = 30;
3030

3131
const width = ui.width - 64;
3232
const height = ui.height - 96;
@@ -47,7 +47,7 @@ namespace ImageList {
4747
{ type: 'checkbox', name: 'chkPrimary', x: 32, y: 28, width: 100, height: 14, isChecked: true, text: 'Primary' },
4848
{ type: 'colourpicker', name: 'clrSecondary', onChange: c => onSecondaryColourChange(c), x: 16, y: 42, width: 12, height: 12 },
4949
{ type: 'checkbox', name: 'chkSecondary', x: 32, y: 42, width: 100, height: 14, isChecked: true, text: 'Secondary' },
50-
{ type: 'colourpicker', name: 'clrTernary', onChange: c => onTernaryColourChange(c), x: 16, y: 56, width: 12, height: 12 },
50+
{ type: 'colourpicker', name: 'clrTertiary', onChange: c => onTertiaryColourChange(c), x: 16, y: 56, width: 12, height: 12 },
5151
{ type: 'checkbox', x: 32, y: 56, width: 100, height: 14, text: 'Blend' },
5252
{ type: 'label', x: 16, y: 74, width: 50, height: 14, text: 'Palette:' },
5353
{ type: 'spinner', name: 'spnPalette', x: 68, y: 72, width: 100, height: 14, text: '0', onDecrement: () => onDecrementPalette(), onIncrement: () => onIncrementPalette() },
@@ -79,8 +79,8 @@ namespace ImageList {
7979
secondaryColour = c;
8080
}
8181

82-
function onTernaryColourChange(c: number) {
83-
ternaryColour = c;
82+
function onTertiaryColourChange(c: number) {
83+
tertiaryColour = c;
8484
}
8585

8686
function onDecrementPalette() {
@@ -152,9 +152,9 @@ namespace ImageList {
152152
secondaryColourWidget.colour = secondaryColour;
153153
}
154154

155-
const ternaryColourWidget = window.findWidget<ColourPickerWidget>('clrTernary');
156-
if (ternaryColourWidget) {
157-
ternaryColourWidget.colour = ternaryColour;
155+
const tertiaryColourWidget = window.findWidget<ColourPickerWidget>('clrTertiary');
156+
if (tertiaryColourWidget) {
157+
tertiaryColourWidget.colour = tertiaryColour;
158158
}
159159

160160
const paletteSpinner = window.findWidget<SpinnerWidget>('spnPalette');
@@ -289,7 +289,7 @@ namespace ImageList {
289289
g.colour = primaryChecked && secondaryChecked ? primaryColour : undefined;
290290
g.secondaryColour = secondaryChecked ? secondaryColour : undefined;
291291
g.paletteId = primaryChecked && !secondaryChecked ? primaryColour : undefined;
292-
g.ternaryColour = ternaryColour;
292+
g.tertiaryColour = tertiaryColour;
293293
g.image(img.id, x - img.offset.x + 1, y - img.offset.y + 1);
294294

295295
output.width = Math.max(textWidth + 4, img.width + 6);

0 commit comments

Comments
 (0)