From 8b8c16a71bd7a666bd2302975ce38078484a26d4 Mon Sep 17 00:00:00 2001 From: Brent Yorgey Date: Mon, 20 Jun 2022 12:56:55 -0500 Subject: [PATCH] switch from U+2591 Light Shade to U+2592 Medium Shade (#449) Some terminals (*e.g.* `gnome-terminal`) use the character to decide how dark or light the color should be, rather than showing the character itself (like *e.g.* `rxvt-unicode`). Light Shade looks OK in terminals that display the actual character, but too dark in terminals that use it as a brightness hint. Medium Shade seems to look good (at least, IMO) in both. See https://github.com/swarm-game/swarm/issues/196#issuecomment-1147298159 . --- data/logo.txt | 6 +++--- images/logo/MkLogo.hs | 2 +- images/logo/logo.txt | 6 +++--- src/Swarm/Game/Terrain.hs | 6 +++--- src/Swarm/TUI/View.hs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/logo.txt b/data/logo.txt index a3231d05..c41a77bb 100644 --- a/data/logo.txt +++ b/data/logo.txt @@ -1,9 +1,9 @@ v v<^vv<<@ ^^ vv >^v^T ^^^v< <>< v > - T ^< >^ < >> v> v< >T <<░^ @><> + T ^< >^ < >> v> v< >T <<▒^ @><> <@v^^>> @v > v> >> v@ @@> << ~v < >~ ^~ >> @^ >v - >>^v^^^ < ~ T~v v< <~ >>T - ░ + >>^v^^^ < ~ T~v v< <~ >>T + ▒ ^ ^ v > > diff --git a/images/logo/MkLogo.hs b/images/logo/MkLogo.hs index cbfbf1ae..71a33c3b 100755 --- a/images/logo/MkLogo.hs +++ b/images/logo/MkLogo.hs @@ -8,7 +8,7 @@ main = do txt' <- (traverse . traverse) replace txt writeFile "logo.txt" (unlines txt') -chars = "<^>vT~@░ " +chars = "<^>vT~@▒ " replace :: Char -> IO Char replace ' ' = pick $ zip (replicate 8 0.005 ++ [1]) chars diff --git a/images/logo/logo.txt b/images/logo/logo.txt index a3231d05..c41a77bb 100644 --- a/images/logo/logo.txt +++ b/images/logo/logo.txt @@ -1,9 +1,9 @@ v v<^vv<<@ ^^ vv >^v^T ^^^v< <>< v > - T ^< >^ < >> v> v< >T <<░^ @><> + T ^< >^ < >> v> v< >T <<▒^ @><> <@v^^>> @v > v> >> v@ @@> << ~v < >~ ^~ >> @^ >v - >>^v^^^ < ~ T~v v< <~ >>T - ░ + >>^v^^^ < ~ T~v v< <~ >>T + ▒ ^ ^ v > > diff --git a/src/Swarm/Game/Terrain.hs b/src/Swarm/Game/Terrain.hs index 68559c33..bdfd689b 100644 --- a/src/Swarm/Game/Terrain.hs +++ b/src/Swarm/Game/Terrain.hs @@ -51,9 +51,9 @@ displayTerrain t = displayWidget Nothing (terrainMap ! t) terrainMap :: Map TerrainType Display terrainMap = M.fromList - [ (StoneT, defaultTerrainDisplay '░' rockAttr) - , (DirtT, defaultTerrainDisplay '░' dirtAttr) - , (GrassT, defaultTerrainDisplay '░' grassAttr) + [ (StoneT, defaultTerrainDisplay '▒' rockAttr) + , (DirtT, defaultTerrainDisplay '▒' dirtAttr) + , (GrassT, defaultTerrainDisplay '▒' grassAttr) , (IceT, defaultTerrainDisplay ' ' iceAttr) , (BlankT, defaultTerrainDisplay ' ' defAttr) ] diff --git a/src/Swarm/TUI/View.hs b/src/Swarm/TUI/View.hs index a22b17c7..2602e5a7 100644 --- a/src/Swarm/TUI/View.hs +++ b/src/Swarm/TUI/View.hs @@ -114,7 +114,7 @@ drawLogo = centerLayer . vBox . map (hBox . T.foldr (\c ws -> drawThing c : ws) attrFor 'T' = plantAttr attrFor '@' = rockAttr attrFor '~' = waterAttr - attrFor '░' = dirtAttr + attrFor '▒' = dirtAttr attrFor _ = defAttr drawNewGameMenuUI :: NonEmpty (BL.List Name ScenarioItem) -> Widget Name