Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Glitched 4th of July ascii art #41452

Merged
merged 5 commits into from
Jun 19, 2020
Merged

Fix Glitched 4th of July ascii art #41452

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc52564
Remove special for for printing the main menu title with colors
BevapDin Jun 19, 2020
946fb99
Inline a variable.
BevapDin Jun 19, 2020
4dc51ab
Inline a variable.
BevapDin Jun 19, 2020
02a737f
Remove unused variable.
BevapDin Jun 19, 2020
2b291de
Reduce amount of color tags:
BevapDin Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions data/title/en.halloween
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# The ASCII art must be 18 lines in height (6 lines per ascii art text line).
# Max length of a line is 80 characters; the following line is for reference.
################################################################################
▄████▄ ▄▄▄ ▄████████▓ ▄█▄ ▄████▄ ██▓ ▓██ ██▓ ████▄▄ ███▄▄███▄
▒██▀ ▀█ ▒████▄ ▓ ██▒ ▓▒▒████▄ ▒██▀ ▀█ ▓██▒ ▒██ ██▒▒██ ▒▓██▒▀██ ██▒
▒▓█ ▄ ▒██ ▀█▄ ▒ ▓██░ ▒░▒██ ▀█▄ ▒▓█ ▄▒██░ ▒██ ██░░ ▓██▄ ▓██ ▓██░▒
▒▓▓▄ ▄██▒░██▄▄▄▄██░ ▓██▓ ░ ░██▄▄▄▄██▒▓▓▄ ▄██▒██░ ░ ▐██▓░ ▒ ██▒██ ▒██ ▓
▒ ▓███▀ ░ ▓█ ▓██▒ ▒██▒ ░ ▓█ ▓██▒ ▓███▀ ░██████▒ ░ ██▒▓░▒██████▒▒██▒ ░██▒░
░ ░▒ ▒ ░ ▒▒ ▓▒█░ ▒ ░░ ▒▒ ▓▒█░ ░▒ ▒ ░ ▒░▓ ░ ██▒▒▒ ▒ ▒▓▒ ▒ ░ ▒░ ░ ░
░ ▒ ▒ ▒▒ ░ ░ ▒ ▒▒ ░ ░ ▒ ░ ░ ▒ ░▓██ ░▒░ ░ ░▒ ░ ░ ░ ░
░ ░ ▒ ░ ░ ▒ ░ ░ ░ ▒ ▒ ░░ ░ ░ ░ ░ ░
░ ░ ░ ░ ░ ░ ░ ░ ░░ ░ ░ ░
░ ▓█████▄ ▄▄▄ ██▀███ ██ ▄█▀ ▓█████▄ ▄▄▄░ ▓██ ██▓ █████▄
▒██▀ ██▌▒████▄ ▓██ ▒ ██▒ ██▄█▒ ▒██▀ ██▌▒████▄ ▒██ ██▒▒██ ▒
░██ █▌▒██ ▀█▄ ▓██ ░▄█ ▒▓███▄░ ░██ █▌▒██ ▀█▄ ▒██ ██░░ ▓██▄
░▓█▄ ▌░██▄▄▄▄██ ▒██▀▀█▄ ▓██ █▄ ░▓█▄ ▌░██▄▄▄▄██ ░ ▐██▓░ ▒ ██▒
░▒████▓ ▓█ ▓██▒░██▓ ▒██▒▒██▒ █▄ ░▒████▓ ▓█ ▓██▒ ░ ██▒▓░▒██████▒▒
▒▒▓ ▒ ▒▒ ▓▒█░░ ▒▓ ░▒▓░▒ ▒▒ ▓▒ ▒▒▓ ▒ ▒▒ ▓▒█░ ██▒▒▒ ▒ ▒▓▒ ▒ ░
░ ▒ ▒ ▒ ▒▒ ░ ░▒ ░ ▒░░ ░▒ ▒░ ░ ▒ ▒ ▒ ▒▒ ░▓██ ░▒░ ░ ░▒ ░ ░
░ ░ ░ ░ ▒ ░░ ░ ░ ░░ ░ ░ ░ ░ ░ ▒ ▒ ▒ ░░ ░ ░ ░
░ ░▄▄▄ ░ ██░ ██ ▓█████ ▄▄▄ ▓█████▄░ ░ ░
░ ▒████▄ ▓██░ ██▒▓█ ▀▒████▄ ▒██▀ ██▌ ░
▒██ ▀█▄ ▒██▀▀██░▒███ ▒██ ▀█▄ ░██ █▌
░██▄▄▄▄██ ░▓█ ░██ ▒▓█ ▄░██▄▄▄▄██ ░▓█▄ ▌
▓█ ▓██▒░▓█▒░██▓░▒████▒▓█ ▓██▒░▒████▓
▒▒ ▓▒█░ ▒ ░░▒░▒░░ ▒░ ░▒▒ ▓▒█░ ▒▒▓ ▒
▒ ▒▒ ░ ▒ ░▒░ ░ ░ ░ ░ ▒ ▒▒ ░ ░ ▒ ▒
░ ▒ ░ ░░ ░ ░ ░ ▒ ░ ░ ░
░ ░ ░ ░ ░ ░ ░ ░ ░ ░
<color_red> ▄<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄ ▄▄▄ ▄<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▓ ▄<color_light_cyan>▓</color>▄ ▄<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄ <color_light_cyan>▓</color><color_light_cyan>▓</color>▓ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color> <color_light_cyan>▓</color><color_light_cyan>▓</color>▓ <color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄▄ <color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄▄<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄
<color_red>▒<color_light_cyan>▓</color><color_light_cyan>▓</color>▀ ▀<color_light_cyan>▓</color> ▒<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄ ▓ <color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ▓▒▒<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▄ ▒<color_light_cyan>▓</color><color_light_cyan>▓</color>▀ ▀<color_light_cyan>▓</color> ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ▒<color_light_cyan>▓</color><color_light_cyan>▓</color> <color_light_cyan>▓</color><color_light_cyan>▓</color>▒▒<color_light_cyan>▓</color><color_light_cyan>▓</color> ▒▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▒▀<color_light_cyan>▓</color><color_light_cyan>▓</color> <color_light_cyan>▓</color><color_light_cyan>▓</color>▒
<color_red>▒▓<color_light_cyan>▓</color> ▄ ▒<color_light_cyan>▓</color><color_light_cyan>▓</color> ▀<color_light_cyan>▓</color>▄ ▒ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>░ ▒░▒<color_light_cyan>▓</color><color_light_cyan>▓</color> ▀<color_light_cyan>▓</color>▄ ▒▓<color_light_cyan>▓</color> ▄▒<color_light_cyan>▓</color><color_light_cyan>▓</color>░ ▒<color_light_cyan>▓</color><color_light_cyan>▓</color> <color_light_cyan>▓</color><color_light_cyan>▓</color>░░ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▄ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color> ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>░▒
<color_red>▒▓▓▄ ▄<color_light_cyan>▓</color><color_light_cyan>▓</color>▒░<color_light_cyan>▓</color><color_light_cyan>▓</color>▄▄▄▄<color_light_cyan>▓</color><color_light_cyan>▓</color>░ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▓ ░ ░<color_light_cyan>▓</color><color_light_cyan>▓</color>▄▄▄▄<color_light_cyan>▓</color><color_light_cyan>▓</color>▒▓▓▄ ▄<color_light_cyan>▓</color><color_light_cyan>▓</color>▒<color_light_cyan>▓</color><color_light_cyan>▓</color>░ ░ ▐<color_light_cyan>▓</color><color_light_cyan>▓</color>▓░ ▒ <color_light_cyan>▓</color><color_light_cyan>▓</color>▒<color_light_cyan>▓</color><color_light_cyan>▓</color> ▒<color_light_cyan>▓</color><color_light_cyan>▓</color> ▓
<color_red>▒ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▀ ░ ▓<color_light_cyan>▓</color> ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ▒<color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ░ ▓<color_light_cyan>▓</color> ▓<color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ▓<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▀ ░<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ░ <color_light_cyan>▓</color><color_light_cyan>▓</color>▒▓░▒<color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color><color_light_cyan>▓</color>▒▒<color_light_cyan>▓</color><color_light_cyan>▓</color>▒ ░<color_light_cyan>▓</color><color_light_cyan>▓</color>▒░
<color_red>░ ░▒ ▒ ░ ▒▒ ▓▒<color_light_cyan>▓</color>░ ▒ ░░ ▒▒ ▓▒<color_light_cyan>▓</color>░ ░▒ ▒ ░ ▒░▓ ░ <color_light_cyan>▓</color><color_light_cyan>▓</color>▒▒▒ ▒ ▒▓▒ ▒ ░ ▒░ ░ ░
<color_red> ░ ▒ ▒ ▒▒ ░ ░ ▒ ▒▒ ░ ░ ▒ ░ ░ ▒ ░▓<color_light_cyan>▓</color><color_light_cyan>▓</color> ░▒░ ░ ░▒ ░ ░ ░ ░
<color_red>░ ░ ▒ ░ ░ ▒ ░ ░ ░ ▒ ▒ ░░ ░ ░ ░ ░ ░
<color_red>░ ░ ░ ░ ░ ░ ░ ░ ░░ ░ ░ ░
<color_red>░ ▓<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▄▄▄ <color_light_blue>▓</color><color_light_blue>▓</color>▀<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color><color_light_blue>▓</color> ▄<color_light_blue>▓</color>▀ ▓<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▄▄▄░ ▓<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color><color_light_blue>▓</color>▓ <color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄
<color_red> ▒<color_light_blue>▓</color><color_light_blue>▓</color>▀ <color_light_blue>▓</color><color_light_blue>▓</color>▌▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▓<color_light_blue>▓</color><color_light_blue>▓</color> ▒ <color_light_blue>▓</color><color_light_blue>▓</color>▒ <color_light_blue>▓</color><color_light_blue>▓</color>▄<color_light_blue>▓</color>▒ ▒<color_light_blue>▓</color><color_light_blue>▓</color>▀ <color_light_blue>▓</color><color_light_blue>▓</color>▌▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▒<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color><color_light_blue>▓</color>▒▒<color_light_blue>▓</color><color_light_blue>▓</color> ▒
<color_red> ░<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color>▌▒<color_light_blue>▓</color><color_light_blue>▓</color> ▀<color_light_blue>▓</color>▄ ▓<color_light_blue>▓</color><color_light_blue>▓</color> ░▄<color_light_blue>▓</color> ▒▓<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄░ ░<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color>▌▒<color_light_blue>▓</color><color_light_blue>▓</color> ▀<color_light_blue>▓</color>▄ ▒<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color><color_light_blue>▓</color>░░ ▓<color_light_blue>▓</color><color_light_blue>▓</color>▄
<color_red> ░▓<color_light_blue>▓</color>▄ ▌░<color_light_blue>▓</color><color_light_blue>▓</color>▄▄▄▄<color_light_blue>▓</color><color_light_blue>▓</color> ▒<color_light_blue>▓</color><color_light_blue>▓</color>▀▀<color_light_blue>▓</color>▄ ▓<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color>▄ ░▓<color_light_blue>▓</color>▄ ▌░<color_light_blue>▓</color><color_light_blue>▓</color>▄▄▄▄<color_light_blue>▓</color><color_light_blue>▓</color> ░ ▐<color_light_blue>▓</color><color_light_blue>▓</color>▓░ ▒ <color_light_blue>▓</color><color_light_blue>▓</color>▒
<color_red> ░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▓ ▓<color_light_blue>▓</color> ▓<color_light_blue>▓</color><color_light_blue>▓</color>▒░<color_light_blue>▓</color><color_light_blue>▓</color>▓ ▒<color_light_blue>▓</color><color_light_blue>▓</color>▒▒<color_light_blue>▓</color><color_light_blue>▓</color>▒ <color_light_blue>▓</color>▄ ░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▓ ▓<color_light_blue>▓</color> ▓<color_light_blue>▓</color><color_light_blue>▓</color>▒ ░ <color_light_blue>▓</color><color_light_blue>▓</color>▒▓░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▒▒
<color_red> ▒▒▓ ▒ ▒▒ ▓▒<color_light_blue>▓</color>░░ ▒▓ ░▒▓░▒ ▒▒ ▓▒ ▒▒▓ ▒ ▒▒ ▓▒<color_light_blue>▓</color>░ <color_light_blue>▓</color><color_light_blue>▓</color>▒▒▒ ▒ ▒▓▒ ▒ ░
<color_red> ░ ▒ ▒ ▒ ▒▒ ░ ░▒ ░ ▒░░ ░▒ ▒░ ░ ▒ ▒ ▒ ▒▒ ░▓<color_light_blue>▓</color><color_light_blue>▓</color> ░▒░ ░ ░▒ ░ ░
<color_red> ░ ░ ░ ░ ▒ ░░ ░ ░ ░░ ░ ░ ░ ░ ░ ▒ ▒ ▒ ░░ ░ ░ ░
<color_red> ░ ░▄▄▄ ░ <color_light_blue>▓</color><color_light_blue>▓</color>░ <color_light_blue>▓</color><color_light_blue>▓</color> ▓<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color> ▄▄▄ ▓<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄░ ░ ░
<color_red> ░ ▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▓<color_light_blue>▓</color><color_light_blue>▓</color>░ <color_light_blue>▓</color><color_light_blue>▓</color>▒▓<color_light_blue>▓</color> ▀▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▄ ▒<color_light_blue>▓</color><color_light_blue>▓</color>▀ <color_light_blue>▓</color><color_light_blue>▓</color>▌ ░
<color_red> ▒<color_light_blue>▓</color><color_light_blue>▓</color> ▀<color_light_blue>▓</color>▄ ▒<color_light_blue>▓</color><color_light_blue>▓</color>▀▀<color_light_blue>▓</color><color_light_blue>▓</color>░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color> ▒<color_light_blue>▓</color><color_light_blue>▓</color> ▀<color_light_blue>▓</color>▄ ░<color_light_blue>▓</color><color_light_blue>▓</color> <color_light_blue>▓</color>▌
<color_red> ░<color_light_blue>▓</color><color_light_blue>▓</color>▄▄▄▄<color_light_blue>▓</color><color_light_blue>▓</color> ░▓<color_light_blue>▓</color> ░<color_light_blue>▓</color><color_light_blue>▓</color> ▒▓<color_light_blue>▓</color> ▄░<color_light_blue>▓</color><color_light_blue>▓</color>▄▄▄▄<color_light_blue>▓</color><color_light_blue>▓</color> ░▓<color_light_blue>▓</color>▄ ▌
<color_red> ▓<color_light_blue>▓</color> ▓<color_light_blue>▓</color><color_light_blue>▓</color>▒░▓<color_light_blue>▓</color>▒░<color_light_blue>▓</color><color_light_blue>▓</color>▓░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▒▓<color_light_blue>▓</color> ▓<color_light_blue>▓</color><color_light_blue>▓</color>▒░▒<color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color><color_light_blue>▓</color>▓
<color_red> ▒▒ ▓▒<color_light_blue>▓</color>░ ▒ ░░▒░▒░░ ▒░ ░▒▒ ▓▒<color_light_blue>▓</color>░ ▒▒▓ ▒
<color_red> ▒ ▒▒ ░ ▒ ░▒░ ░ ░ ░ ░ ▒ ▒▒ ░ ░ ▒ ▒
<color_red> ░ ▒ ░ ░░ ░ ░ ░ ▒ ░ ░ ░
<color_red> ░ ░ ░ ░ ░ ░ ░ ░ ░ ░
42 changes: 6 additions & 36 deletions src/main_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ void main_menu::print_menu( const catacurses::window &w_open, int iSel, const po
int iLine = 0;
const int iOffsetX = ( window_width - FULL_SCREEN_WIDTH ) / 2;

const nc_color cColor1 = c_light_cyan;
const nc_color cColor2 = c_light_blue;
const nc_color cColor3 = c_light_blue;

switch( current_holiday ) {
case holiday::new_year:
break;
Expand All @@ -165,43 +161,17 @@ void main_menu::print_menu( const catacurses::window &w_open, int iSel, const po

if( mmenu_title.size() > 1 ) {
for( size_t i = 0; i < mmenu_title.size(); ++i ) {
switch( current_holiday ) {
case holiday::halloween: {
static const std::string marker = "█";
const utf8_wrapper text( mmenu_title[i] );
for( size_t j = 0; j < text.size(); j++ ) {
std::string temp = text.substr_display( j, 1 ).str();
if( temp != " " ) {
mvwprintz( w_open, point( iOffsetX + j, iLine ),
( temp != marker ) ? c_red : ( i < 9 ? cColor1 : cColor2 ),
"%s", ( temp == marker ) ? "▓" : temp );
}
}
iLine++;
}
break;
case holiday::thanksgiving:
case holiday::new_year:
case holiday::easter:
case holiday::christmas: {
nc_color cur_color = c_white;
nc_color base_color = c_white;
print_colored_text( w_open, point( iOffsetX, iLine++ ), cur_color, base_color, mmenu_title[i] );
}
break;
case holiday::none:
case holiday::num_holiday:
default:
mvwprintz( w_open, point( iOffsetX, iLine++ ), i < 6 ? cColor1 : cColor2, "%s", mmenu_title[i] );
break;
}
nc_color cur_color = c_white;
nc_color base_color = c_white;
print_colored_text( w_open, point( iOffsetX, iLine++ ), cur_color, base_color, mmenu_title[i] );
}
} else {
center_print( w_open, iLine++, cColor1, mmenu_title[0] );
center_print( w_open, iLine++, c_light_cyan, mmenu_title[0] );
}

iLine++;
center_print( w_open, iLine, cColor3, string_format( _( "Version: %s" ), getVersionString() ) );
center_print( w_open, iLine, c_light_blue, string_format( _( "Version: %s" ),
getVersionString() ) );

int menu_length = 0;
for( size_t i = 0; i < vMenuItems.size(); ++i ) {
Expand Down