-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into sdl-fix-atlas-tile-split
- Loading branch information
Showing
74 changed files
with
1,261 additions
and
1,308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| [ | ||
| { | ||
| "type": "effect_type", | ||
| "id": "lightsnare", | ||
| "name": ["Stuck in a light snare"], | ||
| "desc": ["You can't move until you get free!"], | ||
| "apply_message": "You are snared!", | ||
| "rating": "bad", | ||
| "show_in_info": true | ||
| }, | ||
| { | ||
| "type": "effect_type", | ||
| "id": "heavysnare", | ||
| "name": ["Stuck in a heavy snare"], | ||
| "desc": ["You can't move until you get free!"], | ||
| "apply_message": "You are snared!", | ||
| "rating": "bad", | ||
| "show_in_info": true | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Colors | ||
|
|
||
| DDA is colorful game. You can use several foreground and background colors in various places: | ||
|
|
||
| * map data (terrain and furniture); | ||
| * item data; | ||
| * text data; | ||
| * etc. | ||
|
|
||
| **Note:** Map data objects can only have one color-related node defined (either `color` or `bgcolor`). | ||
|
|
||
| ## Color string format | ||
|
|
||
| Whenever color is defined in JSON it should be defined in following format: `Prefix_Foreground_Background`. | ||
|
|
||
| `Prefix` can take one of following values: | ||
|
|
||
| * `c_` - default color prefix (can be ommited); | ||
| * `i_` - optional prefix which indicates that foreground color should be inverted (special rules will be applied to foreground and background colors); | ||
| * `h_` - optional prefix which indicates that foreground color should be highlighted (special rules will be applied to foreground and background colors). | ||
|
|
||
| `Foreground` - defines mandatory color of foreground/ink/font. | ||
|
|
||
| `Background` - defines optional color of background/paper. | ||
|
|
||
| **Note:** If color was not found by its name, then `c_unset` is used for `Foreground` and `i_white` for `Background`. | ||
|
|
||
| ## Examples of color strings | ||
|
|
||
| - `c_white` - `white` color (with default prefix `c_`); | ||
| - `black` - `black` color (default prefix `c_` is ommited); | ||
| - `i_red` - inverted `red` color; | ||
| - `dark_gray_white` - `dark_gray` foreground color with `white` background color; | ||
| - `light_gray_light_red` - `light_gray` foreground color with `light_red` background color; | ||
| - `dkgray_red` - `dark_gray` foreground color with `red` background color (deprecated prefix `dk` instead of `dark_`); | ||
| - `ltblue_red` - `light_blue` foreground color with `red` background color (deprecated prefix `lt` instead of `light_`). | ||
|
|
||
| ## Color code | ||
|
|
||
| Color code is short string which defines color and can be used, for example, in maps notes. | ||
|
|
||
| ## Possible colors | ||
|
|
||
| | Color (image) | Color name (dda) | Color name (curses) | Default R,G,B values | Color code | Notes | | ||
| |:--------------------------------------------------------:|:------------------:|:-------------------:|:--------------------:|:----------:|:------------------------------------------------------:| | ||
| |  | `black` | `BLACK` | `0,0,0` | | | | ||
| |  | `red` | `RED` | `255,0,0` | `R` | | | ||
| |  | `green` | `GREEN` | `0,110,0` | `G` | | | ||
| |  | `brown` | `BROWN` | `92,51,23` | `br` | | | ||
| |  | `blue` | `BLUE` | `0,0,200` | `B` | | | ||
| |  | `magenta` or `pink`| `MAGENTA` | `139,58,98` | `P` | | | ||
| |  | `cyan` | `CYAN` | `0,150,180` | `C` | | | ||
| |  | `light_gray` | `GRAY` | `150,150,150` | `lg` | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `dark_gray` | `DGRAY` | `99,99,99` | `dg` | deprecated `dk` prefix can be used instead of `dark_` | | ||
| |  | `light_red` | `LRED` | `255,150,150` | | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `light_green` | `LGREEN` | `0,255,0` | `g` | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `light_yellow` | `YELLOW` | `255,255,0` | | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `light_blue` | `LBLUE` | `100,100,255` | `b` | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `light_magenta` | `LMAGENTA` | `254,0,254` | `lm` | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `light_cyan` | `LCYAN` | `0,240,255` | `c` | deprecated `lt` prefix can be used instead of `light_` | | ||
| |  | `white` | `WHITE` | `255,255,255` | `W` | | | ||
|
|
||
| **Note:** Default RGB values are taken from file `\data\raw\colors.json`. | ||
| **Note:** RGB values can be redefined in file `\config\base_colors.json`. | ||
|
|
||
| ## Color rules | ||
|
|
||
| There are two types of special color transformation which can affect both foreground and background color: | ||
|
|
||
| * inversion; | ||
| * highlight. | ||
|
|
||
| **Note:** Color rules can be redefined (for example, `\data\raw\color_templates\no_bright_background.json`). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.