diff --git a/resources/g2/font/ae-bold.png b/resources/g2/font/ae-bold.png new file mode 100644 index 0000000000..79a5cc554c Binary files /dev/null and b/resources/g2/font/ae-bold.png differ diff --git a/resources/g2/font/ae-small.png b/resources/g2/font/ae-small.png new file mode 100644 index 0000000000..82295f127c Binary files /dev/null and b/resources/g2/font/ae-small.png differ diff --git a/resources/g2/font/ae-tiny.png b/resources/g2/font/ae-tiny.png new file mode 100644 index 0000000000..c90853e58f Binary files /dev/null and b/resources/g2/font/ae-tiny.png differ diff --git a/resources/g2/font/ae-uc-bold.png b/resources/g2/font/ae-uc-bold.png new file mode 100644 index 0000000000..a2d1110ab1 Binary files /dev/null and b/resources/g2/font/ae-uc-bold.png differ diff --git a/resources/g2/font/ae-uc-small.png b/resources/g2/font/ae-uc-small.png new file mode 100644 index 0000000000..6250b063c3 Binary files /dev/null and b/resources/g2/font/ae-uc-small.png differ diff --git a/resources/g2/font/ae-uc-tiny.png b/resources/g2/font/ae-uc-tiny.png new file mode 100644 index 0000000000..9d3f73adf7 Binary files /dev/null and b/resources/g2/font/ae-uc-tiny.png differ diff --git a/resources/g2/font/o-stroke-bold.png b/resources/g2/font/o-stroke-bold.png new file mode 100644 index 0000000000..77280b6c91 Binary files /dev/null and b/resources/g2/font/o-stroke-bold.png differ diff --git a/resources/g2/font/o-stroke-small.png b/resources/g2/font/o-stroke-small.png new file mode 100644 index 0000000000..31740371ce Binary files /dev/null and b/resources/g2/font/o-stroke-small.png differ diff --git a/resources/g2/font/o-stroke-tiny.png b/resources/g2/font/o-stroke-tiny.png new file mode 100644 index 0000000000..eb5fa007d6 Binary files /dev/null and b/resources/g2/font/o-stroke-tiny.png differ diff --git a/resources/g2/font/o-stroke-uc-bold.png b/resources/g2/font/o-stroke-uc-bold.png new file mode 100644 index 0000000000..d19aca65cd Binary files /dev/null and b/resources/g2/font/o-stroke-uc-bold.png differ diff --git a/resources/g2/font/o-stroke-uc-small.png b/resources/g2/font/o-stroke-uc-small.png new file mode 100644 index 0000000000..2f412bf075 Binary files /dev/null and b/resources/g2/font/o-stroke-uc-small.png differ diff --git a/resources/g2/font/o-stroke-uc-tiny.png b/resources/g2/font/o-stroke-uc-tiny.png new file mode 100644 index 0000000000..9c716e6345 Binary files /dev/null and b/resources/g2/font/o-stroke-uc-tiny.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 4aa9db09d1..1079216d19 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -439,5 +439,80 @@ "path": "icons/eyedropper.png", "x_offset": 5, "y_offset": 5 + }, + { + "path": "font/ae-uc-small.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/ae-small.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-uc-small.png", + "x_offset": -1, + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-small.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/ae-uc-bold.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/ae-bold.png", + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-uc-bold.png", + "x_offset": -1, + "y_offset": -1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-bold.png", + "x_offset": 0, + "y_offset": 2, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/ae-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/ae-tiny.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-uc-tiny.png", + "y_offset": 0, + "palette": "keep", + "forceBmp": true + }, + { + "path": "font/o-stroke-tiny.png", + "y_offset": 1, + "palette": "keep", + "forceBmp": true } ] diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 9acec846ed..16111d66b5 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -840,6 +840,16 @@ enum { SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 123, + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 124, + + SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, + SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1, + SPR_G2_O_STROKE_UPPER = SPR_G2_CHAR_BEGIN + 2, + SPR_G2_O_STROKE_LOWER = SPR_G2_CHAR_BEGIN + 3, + + SPR_G2_CHAR_END = SPR_G2_O_STROKE_LOWER, + SPR_G2_GLYPH_COUNT = (SPR_G2_CHAR_END - SPR_G2_CHAR_BEGIN) + 1, + // 0x60000, chosen because it's a round hex number // of the last possible range of image ID values that is large enough to fit all csg1 sprites. SPR_CSG_BEGIN = 393216,