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

switch from U+2591 Light Shade to U+2592 Medium Shade #449

Merged
merged 2 commits into from
Jun 20, 2022
Merged

switch from U+2591 Light Shade to U+2592 Medium Shade #449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a69d931
switch from U+2591 Light Shade to U+2592 Medium Shade
byorgey Jun 20, 2022
69e1f3e
Merge branch 'main' into medium-shade
mergify[bot] Jun 20, 2022
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
6 changes: 3 additions & 3 deletions data/logo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
v

v<^vv<<@ ^^ vv >^v^T ^^^v< <>< v >
T ^< >^ < >> v> v< >T <v> <<░^ @><>
T ^< >^ < >> v> v< >T <v> <<▒^ @><>
<@v^^>> @v > <T <v<T<^^> v><v< << <<T^ v<
> >> v@ @@> << ~v < >~ ^~ >> @^ >v
>>^v^^^ < ~ T~v v< <~ >>T <v vv ░>
░
>>^v^^^ < ~ T~v v< <~ >>T <v vv ▒>
▒
^ ^ v > >
2 changes: 1 addition & 1 deletion images/logo/MkLogo.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions images/logo/logo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
v

v<^vv<<@ ^^ vv >^v^T ^^^v< <>< v >
T ^< >^ < >> v> v< >T <v> <<░^ @><>
T ^< >^ < >> v> v< >T <v> <<▒^ @><>
<@v^^>> @v > <T <v<T<^^> v><v< << <<T^ v<
> >> v@ @@> << ~v < >~ ^~ >> @^ >v
>>^v^^^ < ~ T~v v< <~ >>T <v vv ░>
░
>>^v^^^ < ~ T~v v< <~ >>T <v vv ▒>
▒
^ ^ v > >
6 changes: 3 additions & 3 deletions src/Swarm/Game/Terrain.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]
2 changes: 1 addition & 1 deletion src/Swarm/TUI/View.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down