1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-05 11:57:56 +00:00

Add color table to docs (#553)

This commit is contained in:
Merith-TK
2021-02-22 10:41:26 -08:00
parent 08b3dbbad5
commit 74ad934889
2 changed files with 147 additions and 16 deletions

View File

@@ -132,3 +132,8 @@ Fix my docs
Thanks @plt-hokusai. Kinda embarrassing this slipped through - I Thanks @plt-hokusai. Kinda embarrassing this slipped through - I
evidently need to lint examples too. evidently need to lint examples too.
``` ```
```
34a2c835d412c0d9e1fb20a42b7f2cd2738289c7
Add color table to docs (#553)
```

View File

@@ -1,15 +1,137 @@
--- The Colors API allows you to manipulate sets of colors. --[[- The Colors API allows you to manipulate sets of colors.
--
-- This is useful in conjunction with Bundled Cables from the RedPower mod, This is useful in conjunction with Bundled Cables from the RedPower mod, RedNet
-- RedNet Cables from the MineFactory Reloaded mod, and colors on Advanced Cables from the MineFactory Reloaded mod, and colors on Advanced Computers and
-- Computers and Advanced Monitors. Advanced Monitors.
--
-- For the non-American English version just replace @{colors} with @{colours} For the non-American English version just replace @{colors} with @{colours} and
-- and it will use the other API, colours which is exactly the same, except in it will use the other API, colours which is exactly the same, except in British
-- British English (e.g. @{colors.gray} is spelt @{colours.grey}). English (e.g. @{colors.gray} is spelt @{colours.grey}).
--
-- @see colours On basic terminals (such as the Computer and Monitor), all the colors are
-- @module colors converted to grayscale. This means you can still use all 16 colors on the
screen, but they will appear as the nearest tint of gray. You can check if a
terminal supports color by using the function @{term.isColor}.
Grayscale colors are calculated by taking the average of the three components,
i.e. `(red + green + blue) / 3`.
<table class="pretty-table">
<thead>
<tr><th colspan="8" align="center">Default Colors</th></tr>
<tr>
<th rowspan="2" align="center">Color</th>
<th colspan="3" align="center">Value</th>
<th colspan="4" align="center">Default Palette Color</th>
</tr>
<tr>
<th>Dec</th><th>Hex</th><th>Paint/Blit</th>
<th>Preview</th><th>Hex</th><th>RGB</th><th>Grayscale</th>
</tr>
</thead>
<tbody>
<tr>
<td><code>colors.white</code></td>
<td align="right">1</td><td align="right">0x1</td><td align="right">0</td>
<td style="background:#F0F0F0"></td><td>#F0F0F0</td><td>240, 240, 240</td>
<td style="background:#F0F0F0"></td>
</tr>
<tr>
<td><code>colors.orange</code></td>
<td align="right">2</td><td align="right">0x2</td><td align="right">1</td>
<td style="background:#F2B233"></td><td>#F2B233</td><td>242, 178, 51</td>
<td style="background:#9D9D9D"></td>
</tr>
<tr>
<td><code>colors.magenta</code></td>
<td align="right">4</td><td align="right">0x4</td><td align="right">2</td>
<td style="background:#E57FD8"></td><td>#E57FD8</td><td>229, 127, 216</td>
<td style="background:#BEBEBE"></td>
</tr>
<tr>
<td><code>colors.lightBlue</code></td>
<td align="right">8</td><td align="right">0x8</td><td align="right">3</td>
<td style="background:#99B2F2"></td><td>#99B2F2</td><td>153, 178, 242</td>
<td style="background:#BFBFBF"></td>
</tr>
<tr>
<td><code>colors.yellow</code></td>
<td align="right">16</td><td align="right">0x10</td><td align="right">4</td>
<td style="background:#DEDE6C"></td><td>#DEDE6C</td><td>222, 222, 108</td>
<td style="background:#B8B8B8"></td>
</tr>
<tr>
<td><code>colors.lime</code></td>
<td align="right">32</td><td align="right">0x20</td><td align="right">5</td>
<td style="background:#7FCC19"></td><td>#7FCC19</td><td>127, 204, 25</td>
<td style="background:#767676"></td>
</tr>
<tr>
<td><code>colors.pink</code></td>
<td align="right">64</td><td align="right">0x40</td><td align="right">6</td>
<td style="background:#F2B2CC"></td><td>#F2B2CC</td><td>242, 178, 204</td>
<td style="background:#D0D0D0"></td>
</tr>
<tr>
<td><code>colors.gray</code></td>
<td align="right">128</td><td align="right">0x80</td><td align="right">7</td>
<td style="background:#4C4C4C"></td><td>#4C4C4C</td><td>76, 76, 76</td>
<td style="background:#4C4C4C"></td>
</tr>
<tr>
<td><code>colors.lightGray</code></td>
<td align="right">256</td><td align="right">0x100</td><td align="right">8</td>
<td style="background:#999999"></td><td>#999999</td><td>153, 153, 153</td>
<td style="background:#999999"></td>
</tr>
<tr>
<td><code>colors.cyan</code></td>
<td align="right">512</td><td align="right">0x200</td><td align="right">9</td>
<td style="background:#4C99B2"></td><td>#4C99B2</td><td>76, 153, 178</td>
<td style="background:#878787"></td>
</tr>
<tr>
<td><code>colors.purple</code></td>
<td align="right">1024</td><td align="right">0x400</td><td align="right">a</td>
<td style="background:#B266E5"></td><td>#B266E5</td><td>178, 102, 229</td>
<td style="background:#A9A9A9"></td>
</tr>
<tr>
<td><code>colors.blue</code></td>
<td align="right">2048</td><td align="right">0x800</td><td align="right">b</td>
<td style="background:#3366CC"></td><td>#3366CC</td><td>51, 102, 204</td>
<td style="background:#777777"></td>
</tr>
<tr>
<td><code>colors.brown</code></td>
<td align="right">4096</td><td align="right">0x1000</td><td align="right">c</td>
<td style="background:#7F664C"></td><td>#7F664C</td><td>127, 102, 76</td>
<td style="background:#656565"></td>
</tr>
<tr>
<td><code>colors.green</code></td>
<td align="right">8192</td><td align="right">0x2000</td><td align="right">d</td>
<td style="background:#57A64E"></td><td>#57A64E</td><td>87, 166, 78</td>
<td style="background:#6E6E6E"></td>
</tr>
<tr>
<td><code>colors.red</code></td>
<td align="right">16384</td><td align="right">0x4000</td><td align="right">e</td>
<td style="background:#CC4C4C"></td><td>#CC4C4C</td><td>204, 76, 76</td>
<td style="background:#767676"></td>
</tr>
<tr>
<td><code>colors.black</code></td>
<td align="right">32768</td><td align="right">0x8000</td><td align="right">f</td>
<td style="background:#111111"></td><td>#111111</td><td>17, 17, 17</td>
<td style="background:#111111"></td>
</tr>
</tbody>
</table>
@see colours
@module colors
]]
local expect = dofile("rom/modules/main/cc/expect.lua").expect local expect = dofile("rom/modules/main/cc/expect.lua").expect
@@ -37,7 +159,7 @@ yellow = 0x10
-- terminal colour of #7FCC19. -- terminal colour of #7FCC19.
lime = 0x20 lime = 0x20
--- Pink. Written as `6` in paint files and @{term.blit}, has a default --- Pink: Written as `6` in paint files and @{term.blit}, has a default
-- terminal colour of #F2B2CC. -- terminal colour of #F2B2CC.
pink = 0x40 pink = 0x40
@@ -77,7 +199,8 @@ red = 0x4000
-- terminal colour of #191919. -- terminal colour of #191919.
black = 0x8000 black = 0x8000
--- Combines a set of colors (or sets of colors) into a larger set. --- Combines a set of colors (or sets of colors) into a larger set. Useful for
-- Bundled Cables.
-- --
-- @tparam number ... The colors to combine. -- @tparam number ... The colors to combine.
-- @treturn number The union of the color sets given in `...` -- @treturn number The union of the color sets given in `...`
@@ -96,7 +219,8 @@ function combine(...)
return r return r
end end
--- Removes one or more colors (or sets of colors) from an initial set. --- Removes one or more colors (or sets of colors) from an initial set. Useful
-- for Bundled Cables.
-- --
-- Each parameter beyond the first may be a single color or may be a set of -- Each parameter beyond the first may be a single color or may be a set of
-- colors (in the latter case, all colors in the set are removed from the -- colors (in the latter case, all colors in the set are removed from the
@@ -121,7 +245,9 @@ function subtract(colors, ...)
return r return r
end end
--- Tests whether `color` is contained within `colors`. --- Tests whether `color` is contained within `colors`. Useful for Bundled
-- Cables.
--
-- --
-- @tparam number colors A color, or color set -- @tparam number colors A color, or color set
-- @tparam number color A color or set of colors that `colors` should contain. -- @tparam number color A color or set of colors that `colors` should contain.