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

Tweak map symbols to be more consistent #258

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Tweak map symbols to be more consistent #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47f08e1
change terrain symbols
mlange-42 Mar 17, 2024
a0e4835
rework first half of map
mlange-42 Mar 17, 2024
d7e0261
rework remaining maps
mlange-42 Mar 17, 2024
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
30 changes: 15 additions & 15 deletions data/json/terrain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"build_cost": [
{"resource": "wood", "amount": 1}
],
"symbols": "pPQ",
"symbols": "'´`",
"description": "A path. Required by all buildings"
},
{
Expand All @@ -107,7 +107,7 @@
{"resource": "wood", "amount": 2},
{"resource": "stones", "amount": 1}
],
"symbols": "b",
"symbols": "\"",
"description": "A path over water. Can bridge a single water tile only"
},

Expand All @@ -121,7 +121,7 @@
{"resource": "wood", "amount": 1},
{"resource": "stones", "amount": 1}
],
"symbols": "f",
"symbols": "%",
"description": "Can be used by farms to produce food. Can be placed on plains only"
},
{
Expand All @@ -134,7 +134,7 @@
"build_cost": [
{"resource": "wood", "amount": 3}
],
"symbols": "eE",
"symbols": "pP",
"description": "Can be used by shepherds to produce food. Can be placed on plains and hills"
},

Expand All @@ -149,7 +149,7 @@
"name": "rock",
"build_on": ["plains", "hills", "desert"],
"can_build": true,
"symbols": "rRU",
"symbols": "oóò",
"description": "Can be used by masons to produce stones. Can't be placed on water"
},

Expand Down Expand Up @@ -180,7 +180,7 @@
"consumption": [
{"resource": "food", "amount": 1}
],
"symbols": "FG",
"symbols": "fF",
"description": "Produces 1 food/min per neighboring field"
},
{
Expand Down Expand Up @@ -209,7 +209,7 @@
"consumption": [
{"resource": "food", "amount": 1}
],
"symbols": "sS",
"symbols": "sś",
"description": "Produces 1 food/min per neighboring pasture"
},
{
Expand Down Expand Up @@ -239,7 +239,7 @@
"consumption": [
{"resource": "food", "amount": 1}
],
"symbols": "iIJ",
"symbols": "iíì",
"description": "Produces 1 food/min per neighboring water"
},
{
Expand Down Expand Up @@ -269,7 +269,7 @@
"consumption": [
{"resource": "food", "amount": 5}
],
"symbols": "lL",
"symbols": "lł",
"description": "Produces 1 wood/min per neighboring tree"
},
{
Expand Down Expand Up @@ -298,7 +298,7 @@
"consumption": [
{"resource": "food", "amount": 5}
],
"symbols": "mMN",
"symbols": "nńñ",
"description": "Produces 1 stone/min per neighboring rock"
},
{
Expand Down Expand Up @@ -330,7 +330,7 @@
"tower", "castle", "warehouse", "church", "monastery"
]
},
"symbols": "wWX",
"symbols": "LŁĹ",
"description": "Increases the population limit by one per neighboring tile without trees or buildings. Stores some food and is a drop-off point for it"
},
{
Expand Down Expand Up @@ -359,7 +359,7 @@
"required_terrain": "path",
"bonus_terrain": ["water"]
},
"symbols": "aAB",
"symbols": "rŕř",
"description": "Increases the population limit by one per neighboring water tile. Stores some food and is a drop-off point for it"
},
{
Expand All @@ -381,7 +381,7 @@
{"resource": "wood", "amount": 25},
{"resource": "stones", "amount": 25}
],
"symbols": "hHK",
"symbols": "AÁÀ",
"description": "Stores resources and is a drop-off point for haulers"
},
{
Expand All @@ -404,7 +404,7 @@
{"resource": "wood", "amount": 1},
{"resource": "stones", "amount": 1}
],
"symbols": "oóò",
"symbols": "OÓÒ",
"description": "Conquers land to colonize"
},
{
Expand All @@ -427,7 +427,7 @@
{"resource": "wood", "amount": 3},
{"resource": "stones", "amount": 3}
],
"symbols": "cCD",
"symbols": "cćĉ",
"description": "Conquers land to colonize"
},
{
Expand Down
24 changes: 12 additions & 12 deletions data/maps/Coastline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@
"--T------------~~~-^T^t~t---------------",
"-^^---t-------t~t--^^-t~~t--------------",
"-T^-----------t~~-T^T--t~t-------t------",
"-^---------UU-tt~t^^-rrt~t--------------",
"-----------UU--t~t^--t~~~r------tt------",
"-^---------òò-tt~t^^-oot~t--------------",
"-----------òò--t~t^--t~~~o------tt------",
"-----tt--------t~~ttt~~tt------tTTT-----",
"-----ttt------ttt~t~~~ttt-----tTTRt-----",
"-----ttt------ttt~t~~~ttt-----tTTót-----",
"----tt~~tt---t~~~~~~tttt------TTt-------",
"-----t~~tt--tt~rtttttt------------------",
"-----t~~tt--tt~otttttt------------------",
"-----ttttt-tTt~~tTTTt-----TT------------",
"------tttt-TTTt~tTTT--t---TT------------",
"---^^-----TTTtt~tTT-------^-------------",
"--^T^----tTttt~~t--------^--------------",
"---^------^r~~~tt-t----TT---------ttt---",
"----------tr~ttt-------TT---------ttt---",
"----------r~~tt--------------------t----",
"---^------^o~~~tt-t----TT---------ttt---",
"----------to~ttt-------TT---------ttt---",
"----------o~~tt--------------------t----",
"----------t~ttt-t-----------------------",
"----------t~ttt-------------------------",
"----------t~~tt---h---------------------",
"---tTT----tt~tt-----------UU---ttt^^----",
"--tTTTT----t~~~t----------UU--ttttt^^---",
"----------t~~tt---A---------------------",
"---tTT----tt~tt-----------òò---ttt^^----",
"--tTTTT----t~~~t----------òò--ttttt^^---",
"--TTTt--tt--tt~t------t-------t~~~tt^---",
"--------tt---t~------tt--~~----~~~ttt---",
"---~~~~r--++-~~~--------r~~~r---tttt----",
"---~~~~~~~r--~~~~~~~~~--~~~~~~r---------",
"---~~~~o--++-~~~--------o~~~o---tttt----",
"---~~~~~~~o--~~~~~~~~~--~~~~~~o---------",
"-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--~~~---",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
Expand Down
54 changes: 27 additions & 27 deletions data/maps/Desert Valley.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,40 @@
},
"map": [
"....................++++++++++++.........",
"................+++++++UU+++++++++.......",
"..............++++++++UU+++++++++++......",
"............++++U++++++++++^--------.....",
"..........++++UU++++++++++---tt-------...",
".........+++++UU+++++++++----~~~~tt----..",
"........++U+++++++++++++^---t~tt~~~~~---.",
".......++UU++++++++++++^---t~~tttttt~t---",
"................+++++++òò+++++++++.......",
"..............++++++++òò+++++++++++......",
"............++++ò++++++++++^--------.....",
"..........++++òò++++++++++---tt-------...",
".........+++++òò+++++++++----~~~~tt----..",
"........++ò+++++++++++++^---t~tt~~~~~---.",
".......++òò++++++++++++^---t~~tttttt~t---",
"......+++++++++++++++++^---t~tt-----~~~~~",
".....+++++++++++++UU+++^---t~t-------t---",
"....++++U++++++++++U+++---~~~----++^^----",
"....+++UU++++++++++++++--t~tt--+++++++++-",
"...++++U++++++++++++++--t~~t--^+++UUU++++",
"..+++++++++++++++++++---t~tt--^+++UU+++++",
".++U+++++++++UU+++++^---t~tt--^+++U++++++",
".++++++++++++UU+++++t----~~~--+++++++++U+",
".....+++++++++++++òò+++^---t~t-------t---",
"....++++ò++++++++++ò+++---~~~----++^^----",
"....+++òò++++++++++++++--t~tt--+++++++++-",
"...++++ò++++++++++++++--t~~t--^+++òòò++++",
"..+++++++++++++++++++---t~tt--^+++òò+++++",
".++ò+++++++++òò+++++^---t~tt--^+++ò++++++",
".++++++++++++òò+++++t----~~~--+++++++++ò+",
".++++++++++++++++++tt-----t~--+++++++++++",
".------++++++-------------t~--+++++++++++",
".---~~~-^+++--ttt--------t~~--+U+++++++++",
"~~~~~t~t----t~~~~ttt--h--t~t--+U+++++++++",
".---~~~-^+++--ttt--------t~~--+ò+++++++++",
"~~~~~t~t----t~~~~ttt--A--t~t--+ò+++++++++",
".-ttt-~t---tt~tt~~~~t----t~t-+++++++++++.",
".-----~~ttt~~~---tt~ttt--~~--+++++++++++.",
".------~~~~~tt-----~~~~~-~t-^++++++++U++.",
".++^^---tt----------ttt~~~--++++++++UU++.",
".++++^----+++++^-----------+++++++++UU+..",
"..++++++++++++++^^^^+++++++++++++++UU++..",
"...++U+++U++++++++++++++UU+++++++++++++..",
"....+++++UUU+++++++++++++U++++++++++++...",
".....+++++UUU+++++++++++++++++++++++++...",
"......+++++UU++++++UU++++++++++++U+++....",
".------~~~~~tt-----~~~~~-~t-^++++++++ò++.",
".++^^---tt----------ttt~~~--++++++++òò++.",
".++++^----+++++^-----------+++++++++òò+..",
"..++++++++++++++^^^^+++++++++++++++òò++..",
"...++ò+++ò++++++++++++++òò+++++++++++++..",
"....+++++òòò+++++++++++++ò++++++++++++...",
".....+++++òòò+++++++++++++++++++++++++...",
"......+++++òò++++++òò++++++++++++ò+++....",
".......++++++++++++++++++++++++++++++....",
"........++++++++++++++++++++++++++++.....",
".........++++++++++++++++++U+++++++......",
"...........++++UU++++++++++++++++........",
".............+++UU++++++++++++++.........",
".........++++++++++++++++++ò+++++++......",
"...........++++òò++++++++++++++++........",
".............+++òò++++++++++++++.........",
"................+++++++++++++............",
"..................++++++++..............."
],
Expand Down
24 changes: 12 additions & 12 deletions data/maps/Great Plains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,37 @@
"-------------tt----------------------------",
"----t--------------------------------------",
"---t~--------------------------------------",
"---t~--------------------TR----------------",
"-------------------------R^----------------",
"---t~--------------------Tó----------------",
"-------------------------ó^----------------",
"-------------------------------------------",
"-------------ttt----------------------tt---",
"------------ttttt--------------------tttt--",
"------------tttT---------------------tttt--",
"-------------t^^------------tt--------rT---",
"---------------------------tttt--------R---",
"-------------t^^------------tt--------oT---",
"---------------------------tttt--------ó---",
"--------------------------tt~~t------------",
"---------------------------t~~tt-----------",
"---------------------------ttttt-----------",
"-------------r-------------RRtt------------",
"--r----------r--------------R--------------",
"-rT----------------------------------------",
"-------------o-------------óótt------------",
"--o----------o--------------ó--------------",
"-oT----------------------------------------",
"--^----------------------------------------",
"---------------------h---------------------",
"---------------------A---------------------",
"---------------tt--------------------------",
"--------------tttt-------------------------",
"--------------ttttt------------------------",
"---------------ttt-------------------------",
"---------------------------------rtt-------",
"---------------------------------ott-------",
"---------------------------------ttt-------",
"---------------------------------tt--------",
"-------------------------------------------",
"-------------------------------------------",
"------------ttt----------------------------",
"-----------ttttt---------------------------",
"-----------r~~tt---------------------------",
"-----------o~~tt---------------------------",
"-----------t~~tt---------------------------",
"--tt-------t~~tt-----------TR--------------",
"--tt--------ttt------------Tr--------------",
"--tt-------t~~tt-----------Tó--------------",
"--tt--------ttt------------To--------------",
"--------------------------------------tt---",
"--------------------------------------ttt--",
"--------------------------------------tt---",
Expand Down
38 changes: 19 additions & 19 deletions data/maps/River Delta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
"------------------------~~---------------------------",
"---tt-------------------~~---------------------------",
"--tTTt-----------tT-----~~~----t^-----tTt------------",
"--TTTt-----T----tTTt----~r~----^^----tTTTt-----------",
"--TTr-----------tTTt--tt~-~----------tTTTt-----------",
"--TT------------TTT----t~~~----------tTTr------------",
"--TTTt-----T----tTTt----~o~----^^----tTTTt-----------",
"--TTo-----------tTTt--tt~-~----------tTTTt-----------",
"--TT------------TTT----t~~~----------tTTo------------",
"--T-----T-------TT---t~~~~~----------ttt-------------",
"-------^^-----------~~~--~~------------------------tT",
"-------------------t~--t-~~-----------------------tTT",
"---------------trrt~~---~~~---tTT----------------ttTT",
"-------------t~~~~r~t---~~~---RTT-----------T----tTTT",
"----------tttt~tt~~~---t~~~---RTT----------------TTTT",
"---------------toot~~---~~~---tTT----------------ttTT",
"-------------t~~~~o~t---~~~---óTT-----------T----tTTT",
"----------tttt~tt~~~---t~~~---óTT----------------TTTT",
"---^-----tTTtt~~ttt----~~~~t--TT-----------------TTTt",
"---------TTTttr~tt-----~~~~t----------------------tt-",
"---------TTTtto~tt-----~~~~t----------------------tt-",
"--------tTTT--~~t----tt~tt~tt------------tt----------",
"-----ttttTT---~ttttt~~~~tt~rt-----------tTTT---------",
"-----ttttTT---~ttttt~~~~tt~ot-----------tTTT---------",
"----tTTTT----t~~~~~~~ttttt~~~t---------tTTTt---------",
"----TTTt-----~~ttt~tttTTTttr~~t--------TTTt----------",
"----TTt---ttr~tttt~ttTTTTTttt~ttt--------------------",
"----TTTt-----~~ttt~tttTTTtto~~t--------TTTt----------",
"----TTt---tto~tttt~ttTTTTTttt~ttt--------------------",
"----------~~~~tt-t~~tTT----tt~~~~t-------------------",
"-------~~~~tttt---t~~t-------trr~~~t--tt---tt-----T--",
"------t~rrttTT-----t~t-------ttt~r~~~tr~~~~~~t----^--",
"------t~~rtTTT------~----------t~-~t~~~~trr~~~t------",
"-T----tt~~tTTt----r~~-----------~~~tttttttt~r~t------",
"-^----ttt~tTT----~~~t---h-------t~tt---tTTt~-~-------",
"-----tttt~tTt----~r~t-----------t~rt----TTt~~~t------",
"-----tt~~~t------~-~-----------tr~~~------tt~tt------",
"-------~~~~tttt---t~~t-------too~~~t--tt---tt-----T--",
"------t~oottTT-----t~t-------ttt~o~~~to~~~~~~t----^--",
"------t~~otTTT------~----------t~-~t~~~~too~~~t------",
"-T----tt~~tTTt----o~~-----------~~~tttttttt~o~t------",
"-^----ttt~tTT----~~~t---A-------t~tt---tTTt~-~-------",
"-----tttt~tTt----~o~t-----------t~ot----TTt~~~t------",
"-----tt~~~t------~-~-----------to~~~------tt~tt------",
"-----t~~t--------~~~-----------t~~t~~------t~~~tt----",
"-----t~~~--------~tt---RT-----~~~ttt~--------t~~~t---",
"------~r~--------~tt---RT----t~t----~~---------t~t---",
"-----t~~~--------~tt---óT-----~~~ttt~--------t~~~t---",
"------~o~--------~tt---óT----t~t----~~---------t~t---",
"------~-~--------~~~~t-------t~t----t~---------t~t---",
"--T---~~~t-------t~t~~~------~~-----t~---------~~----",
"-------~~~-------~~--t~-----t~t------~~~-------~t----",
Expand Down
6 changes: 3 additions & 3 deletions data/maps/River.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"...------------~t-..",
"..-----TTT----t~t--.",
".-----TTTT----t~~t-.",
".----rTTT-----rt~t--",
"------Tt------rt~t--",
".----oTTT-----ot~t--",
"------Tt------ot~t--",
"---------------t~~--",
"--ttt---h------tt~--",
"--ttt---A------tt~--",
"~~~~~t--------ttt~--",
"---t~~t----t~~~~t~--",
"----t~t---tt~tt~~~--",
Expand Down
18 changes: 9 additions & 9 deletions data/maps/Rolling Hills.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
"TTTt-----TT-------tTTT--TT",
"TT----t-----------TTt-----",
"TT---TTT----------TT----~~",
"R----TT------ttT^-----~~~-",
"ó----TT------ttT^-----~~~-",
"----tTT--TT-ttTT------~t-t",
"---TTT--TTT-TTTT-----t~--T",
"--TTTT--TT--TTT---^--~~-TT",
"---TT------TTR---TT--~t-TT",
"---TT------TTó---TT--~t-TT",
"-----------TT--TTT---~t--T",
"---------T--R--T^----~~~--",
"---------T--ó--T^----~~~--",
"tt------TT---------T^--~--",
"tTT----TT---h-----TTT--~--",
"TTT----TT-------RTTT--~~--",
"tTT----TT---A-----TTT--~--",
"TTT----TT-------óTTT--~~--",
"TTT-----T^------------~---",
"TT--~~~~---------~~~~t~---",
"---~~--~~~----t~~~--~~~--R",
"---~~--~~~----t~~~--~~~--ó",
"~~~~--T--~t~~~~~---------T",
"-----TTT-~~~--------TR---T",
"-----TTT-~~~--------Tó---T",
"---TTTTT--------^--TT-----",
"T--TTt-RR-----TTT-TTt-----",
"T--TTt-óó-----TTT-TTt-----",
"TT-----------TTT---TT----T",
"TT-----------TT---TTT--R-T",
"TT-----------TT---TTT--ó-T",
"TT-TT-------TTT---TT----TT",
"-TTTT-------T^----T----TTT",
"-^TT------------------TTTT"
Expand Down
Loading
Loading