AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ethiopia - Nation (#5387)

Browse Source 
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
This commit is contained in:
SomeTroglodyte 2021-10-04 19:56:34 +02:00 committed by GitHub
parent ec036dc3dd
commit 088e35ff13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 792 additions and 707 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images.Construction/BuildingIcons/Stele.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
android/Images.Construction/UnitIcons/Mehal Sefari.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
android/Images/NationIcons/Ethiopia.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
android/Images/UnitPromotionIcons/Home Sweet Home.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

242
android/assets/Construction.atlas
View File

@ -419,441 +419,448 @@ BuildingIcons/Medical Lab
index: -1 index: -1
BuildingIcons/Military Academy BuildingIcons/Military Academy
rotate: false rotate: false
xy: 1300, 1516 xy: 1408, 1624
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Military Base BuildingIcons/Military Base
rotate: false rotate: false
xy: 1408, 1624 xy: 1516, 1732
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Mint BuildingIcons/Mint
rotate: false rotate: false
xy: 1516, 1732 xy: 1624, 1840
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Monastery BuildingIcons/Monastery
rotate: false rotate: false
xy: 544, 652 xy: 652, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Monument BuildingIcons/Monument
rotate: false rotate: false
xy: 652, 760 xy: 760, 868
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Mosque BuildingIcons/Mosque
rotate: false rotate: false
xy: 760, 868 xy: 868, 982
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Mud Pyramid Mosque BuildingIcons/Mud Pyramid Mosque
rotate: false rotate: false
xy: 868, 982 xy: 976, 1084
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Mughal Fort BuildingIcons/Mughal Fort
rotate: false rotate: false
xy: 976, 1084 xy: 1084, 1192
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Museum BuildingIcons/Museum
rotate: false rotate: false
xy: 1084, 1192 xy: 1192, 1300
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/National College BuildingIcons/National College
rotate: false rotate: false
xy: 1516, 1624 xy: 1624, 1732
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/National Epic BuildingIcons/National Epic
rotate: false rotate: false
xy: 1624, 1732 xy: 1732, 1840
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/National Treasury BuildingIcons/National Treasury
rotate: false rotate: false
xy: 1732, 1840 xy: 4, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Neuschwanstein BuildingIcons/Neuschwanstein
rotate: false rotate: false
xy: 4, 4 xy: 112, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Notre Dame BuildingIcons/Notre Dame
rotate: false rotate: false
xy: 220, 220 xy: 328, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Nuclear Plant BuildingIcons/Nuclear Plant
rotate: false rotate: false
xy: 436, 436 xy: 544, 544
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Observatory BuildingIcons/Observatory
rotate: false rotate: false
xy: 652, 652 xy: 760, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Opera House BuildingIcons/Opera House
rotate: false rotate: false
xy: 760, 760 xy: 868, 874
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Oxford University BuildingIcons/Oxford University
rotate: false rotate: false
xy: 868, 874 xy: 976, 976
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Pagoda BuildingIcons/Pagoda
rotate: false rotate: false
xy: 976, 976 xy: 1084, 1084
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Palace BuildingIcons/Palace
rotate: false rotate: false
xy: 1084, 1084 xy: 1192, 1192
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Paper Maker BuildingIcons/Paper Maker
rotate: false rotate: false
xy: 1300, 1301 xy: 1408, 1409
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Pentagon BuildingIcons/Pentagon
rotate: false rotate: false
xy: 1516, 1516 xy: 1624, 1624
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Petra BuildingIcons/Petra
rotate: false rotate: false
xy: 1732, 1732 xy: 1840, 1840
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Porcelain Tower BuildingIcons/Porcelain Tower
rotate: false rotate: false
xy: 220, 112 xy: 328, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Public School BuildingIcons/Public School
rotate: false rotate: false
xy: 436, 328 xy: 544, 436
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Research Lab BuildingIcons/Research Lab
rotate: false rotate: false
xy: 652, 544 xy: 760, 652
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/SS Booster BuildingIcons/SS Booster
rotate: false rotate: false
xy: 976, 868 xy: 1084, 976
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/SS Cockpit BuildingIcons/SS Cockpit
rotate: false rotate: false
xy: 1084, 976 xy: 1192, 1084
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/SS Engine BuildingIcons/SS Engine
rotate: false rotate: false
xy: 1192, 1084 xy: 1300, 1192
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/SS Stasis Chamber BuildingIcons/SS Stasis Chamber
rotate: false rotate: false
xy: 1300, 1193 xy: 1408, 1301
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Satrap's Court BuildingIcons/Satrap's Court
rotate: false rotate: false
xy: 1516, 1408 xy: 1624, 1516
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Seaport BuildingIcons/Seaport
rotate: false rotate: false
xy: 1840, 1732 xy: 220, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Shrine BuildingIcons/Shrine
rotate: false rotate: false
xy: 436, 220 xy: 544, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Sistine Chapel BuildingIcons/Sistine Chapel
rotate: false rotate: false
xy: 652, 436 xy: 760, 544
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Solar Plant BuildingIcons/Solar Plant
rotate: false rotate: false
xy: 868, 658 xy: 976, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Spaceship Factory BuildingIcons/Spaceship Factory
rotate: false rotate: false
xy: 976, 760 xy: 1084, 868
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Stable BuildingIcons/Stable
rotate: false rotate: false
xy: 1192, 976 xy: 1300, 1084
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Stadium BuildingIcons/Stadium
rotate: false rotate: false
xy: 1300, 1085 xy: 1408, 1193
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Statue of Liberty BuildingIcons/Statue of Liberty
rotate: false rotate: false
xy: 1408, 1192 xy: 1516, 1300
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Statue of Zeus BuildingIcons/Statue of Zeus
rotate: false rotate: false
xy: 1516, 1300 xy: 1624, 1408
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Stock Exchange BuildingIcons/Stele
rotate: false
xy: 1732, 1516
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stone Works
rotate: false rotate: false
xy: 1840, 1624 xy: 1840, 1624
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Stonehenge BuildingIcons/Stock Exchange
rotate: false rotate: false
xy: 328, 4 xy: 328, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Stone Works
rotate: false
xy: 436, 112
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Stonehenge
rotate: false
xy: 544, 220
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
BuildingIcons/Sydney Opera House BuildingIcons/Sydney Opera House
rotate: false rotate: false
xy: 652, 328 xy: 868, 550
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Taj Mahal BuildingIcons/Taj Mahal
rotate: false rotate: false
xy: 760, 436 xy: 976, 652
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Temple BuildingIcons/Temple
rotate: false rotate: false
xy: 976, 652 xy: 1192, 868
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Temple of Artemis BuildingIcons/Temple of Artemis
rotate: false rotate: false
xy: 1084, 760 xy: 1300, 976
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Terracotta Army BuildingIcons/Terracotta Army
rotate: false rotate: false
xy: 1300, 977 xy: 1516, 1192
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/The Great Library BuildingIcons/The Great Library
rotate: false rotate: false
xy: 1408, 1084 xy: 1624, 1300
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/The Great Lighthouse BuildingIcons/The Great Lighthouse
rotate: false rotate: false
xy: 1516, 1192 xy: 1732, 1408
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/The Louvre BuildingIcons/The Louvre
rotate: false rotate: false
xy: 1624, 1300 xy: 1840, 1516
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/The Oracle BuildingIcons/The Oracle
rotate: false rotate: false
xy: 1732, 1408 xy: 436, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/The Pyramids BuildingIcons/The Pyramids
rotate: false rotate: false
xy: 1840, 1516 xy: 544, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Theatre BuildingIcons/Theatre
rotate: false rotate: false
xy: 436, 4 xy: 652, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/United Nations BuildingIcons/United Nations
rotate: false rotate: false
xy: 976, 544 xy: 1192, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/University BuildingIcons/University
rotate: false rotate: false
xy: 1084, 652 xy: 1300, 868
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Utopia Project BuildingIcons/Utopia Project
rotate: false rotate: false
xy: 1192, 760 xy: 1408, 977
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Walls BuildingIcons/Walls
rotate: false rotate: false
xy: 1300, 869 xy: 1516, 1084
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Walls of Babylon BuildingIcons/Walls of Babylon
rotate: false rotate: false
xy: 1408, 976 xy: 1624, 1192
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Wat BuildingIcons/Wat
rotate: false rotate: false
xy: 1840, 1408 xy: 652, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Water Mill BuildingIcons/Water Mill
rotate: false rotate: false
xy: 544, 4 xy: 760, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Windmill BuildingIcons/Windmill
rotate: false rotate: false
xy: 652, 112 xy: 868, 334
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
BuildingIcons/Workshop BuildingIcons/Workshop
rotate: false rotate: false
xy: 976, 436 xy: 1192, 652
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
@ -1369,310 +1376,317 @@ UnitIcons/Mechanized Infantry
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Minuteman UnitIcons/Mehal Sefari
rotate: false rotate: false
xy: 1624, 1840 xy: 1300, 1516
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Missile Cruiser UnitIcons/Minuteman
rotate: false rotate: false
xy: 4, 112 xy: 4, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Missionary UnitIcons/Missile Cruiser
rotate: false rotate: false
xy: 112, 220 xy: 112, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Mobile SAM UnitIcons/Missionary
rotate: false rotate: false
xy: 220, 328 xy: 220, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Modern Armor UnitIcons/Mobile SAM
rotate: false rotate: false
xy: 328, 436 xy: 328, 436
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Mohawk Warrior UnitIcons/Modern Armor
rotate: false rotate: false
xy: 436, 544 xy: 436, 544
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Mohawk Warrior
rotate: false
xy: 544, 652
size: 100, 100
orig: 100, 100
offset: 0, 0
index: -1
UnitIcons/Musketeer UnitIcons/Musketeer
rotate: false rotate: false
xy: 1192, 1300 xy: 1300, 1408
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Musketman UnitIcons/Musketman
rotate: false rotate: false
xy: 1300, 1409 xy: 1408, 1517
size: 100, 99 size: 100, 99
orig: 100, 99 orig: 100, 99
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Naresuan's Elephant UnitIcons/Naresuan's Elephant
rotate: false rotate: false
xy: 1408, 1516 xy: 1516, 1624
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Norwegian Ski Infantry UnitIcons/Norwegian Ski Infantry
rotate: false rotate: false
xy: 112, 112 xy: 220, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Nuclear Missile UnitIcons/Nuclear Missile
rotate: false rotate: false
xy: 328, 328 xy: 436, 436
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Nuclear Submarine UnitIcons/Nuclear Submarine
rotate: false rotate: false
xy: 544, 544 xy: 652, 652
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Panzer UnitIcons/Panzer
rotate: false rotate: false
xy: 1192, 1192 xy: 1300, 1300
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Paratrooper UnitIcons/Paratrooper
rotate: false rotate: false
xy: 1408, 1408 xy: 1516, 1516
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Persian Immortal UnitIcons/Persian Immortal
rotate: false rotate: false
xy: 1624, 1624 xy: 1732, 1732
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Pictish Warrior UnitIcons/Pictish Warrior
rotate: false rotate: false
xy: 1840, 1840 xy: 112, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Pikeman UnitIcons/Pikeman
rotate: false rotate: false
xy: 112, 4 xy: 220, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Privateer UnitIcons/Privateer
rotate: false rotate: false
xy: 328, 220 xy: 436, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Quinquereme UnitIcons/Quinquereme
rotate: false rotate: false
xy: 544, 436 xy: 652, 544
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Rifleman UnitIcons/Rifleman
rotate: false rotate: false
xy: 760, 652 xy: 868, 766
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Rocket Artillery UnitIcons/Rocket Artillery
rotate: false rotate: false
xy: 868, 766 xy: 976, 868
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Samurai UnitIcons/Samurai
rotate: false rotate: false
xy: 1408, 1300 xy: 1516, 1408
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Scout UnitIcons/Scout
rotate: false rotate: false
xy: 1624, 1516 xy: 1732, 1624
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Sea Beggar UnitIcons/Sea Beggar
rotate: false rotate: false
xy: 1732, 1624 xy: 1840, 1732
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Settler UnitIcons/Settler
rotate: false rotate: false
xy: 220, 4 xy: 328, 112
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Ship of the Line UnitIcons/Ship of the Line
rotate: false rotate: false
xy: 328, 112 xy: 436, 220
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Sipahi UnitIcons/Sipahi
rotate: false rotate: false
xy: 544, 328 xy: 652, 436
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Slinger UnitIcons/Slinger
rotate: false rotate: false
xy: 760, 544 xy: 868, 658
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Spearman UnitIcons/Spearman
rotate: false rotate: false
xy: 1084, 868 xy: 1192, 976
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Stealth Bomber UnitIcons/Stealth Bomber
rotate: false rotate: false
xy: 1624, 1408 xy: 1732, 1516
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Submarine UnitIcons/Submarine
rotate: false rotate: false
xy: 436, 112 xy: 652, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Swordsman UnitIcons/Swordsman
rotate: false rotate: false
xy: 544, 220 xy: 760, 436
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Tank UnitIcons/Tank
rotate: false rotate: false
xy: 868, 550 xy: 1084, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Tercio UnitIcons/Tercio
rotate: false rotate: false
xy: 1192, 868 xy: 1408, 1085
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Trebuchet UnitIcons/Trebuchet
rotate: false rotate: false
xy: 544, 112 xy: 760, 328
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Triplane UnitIcons/Triplane
rotate: false rotate: false
xy: 652, 220 xy: 868, 442
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Trireme UnitIcons/Trireme
rotate: false rotate: false
xy: 760, 327 xy: 976, 543
size: 100, 101 size: 100, 101
orig: 100, 101 orig: 100, 101
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Turtle Ship UnitIcons/Turtle Ship
rotate: false rotate: false
xy: 868, 442 xy: 1084, 652
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/War Chariot UnitIcons/War Chariot
rotate: false rotate: false
xy: 1516, 1084 xy: 1732, 1300
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/War Elephant UnitIcons/War Elephant
rotate: false rotate: false
xy: 1624, 1192 xy: 1840, 1408
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Warrior UnitIcons/Warrior
rotate: false rotate: false
xy: 1732, 1300 xy: 544, 4
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Work Boats UnitIcons/Work Boats
rotate: false rotate: false
xy: 760, 219 xy: 976, 435
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Worker UnitIcons/Worker
rotate: false rotate: false
xy: 868, 334 xy: 1084, 544
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0
index: -1 index: -1
UnitIcons/Zero UnitIcons/Zero
rotate: false rotate: false
xy: 1084, 544 xy: 1300, 760
size: 100, 100 size: 100, 100
orig: 100, 100 orig: 100, 100
offset: 0, 0 offset: 0, 0

BIN
android/assets/Construction.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 KiB

After

Width:  |  Height:  |  Size: 672 KiB

1102
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

11
android/assets/jsons/Civ V - Vanilla/Buildings.json
View File

@ -21,6 +21,17 @@
"maintenance": 1, "maintenance": 1,
"uniques": ["Destroyed when the city is captured"] "uniques": ["Destroyed when the city is captured"]
}, },
{
"name": "Stele",
"replaces": "Monument",
"uniqueTo": "Ethiopia",
"culture": 2,
"faith": 2,
"cost": 40,
"hurryCostModifier": 40,
"maintenance": 1,
"uniques": ["Destroyed when the city is captured"] //"Hidden when religion is disabled"
},
// Column 1 // Column 1
{ {
"name": "Granary", "name": "Granary",

35
android/assets/jsons/Civ V - Vanilla/Nations.json
View File

@ -863,7 +863,42 @@
"St. Austell","Saint-Malo","Onchan","Dundee","Londonderry","Llanfairpwllgwyngyll","Falmouth","Lorient"] "St. Austell","Saint-Malo","Onchan","Dundee","Londonderry","Llanfairpwllgwyngyll","Falmouth","Lorient"]
// Llanfairpwllgwyngyll should actually be Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch // Llanfairpwllgwyngyll should actually be Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch
}, },
{
"name": "Ethiopia",
"leaderName": "Haile Selassie",
"adjective": ["ethiopian"],
"startBias": ["Jungle"],
"preferredVictoryType": "Cultural",
"startIntroPart1": "Blessings be upon you, honorable and righteous Emperor of Ethiopia, Haile Selassie. Your legacy as one of Ethiopia's greatest rulers, and as the spiritual leader to the Rastafarian movement, is outshone only by the influence you had on diplomacy and political cooperation throughout the world. In introducing Ethiopia's first written constitution, you planted the seeds of democracy that would take root over the coming years, and your infinitely wise grasp of global affairs secured Ethiopia's place as a charter member of the United Nations. Spearheading efforts to reform and modernize the nation during your reign, you changed the course of Ethiopian history forever",
"startIntroPart2": "Revered king, your composed demeanor once protected the people from the many conflicts that plague the nations of men, and the kingdom looks to you to assure peace once again. Will you lead the people with courage and authority, moving forward into a new age? Will you build a civilization that stands the test of time?",
"declaringWar": "I have tried all other avenues, but yet you persist in this madness. I hope, for your sake, your end is swift.",
"attacked": "It is silence that allows evil to triumph. We will not stand mute and allow you to continue on this mad quest unchecked.",
"defeated": "God and history will remember your actions this day. I hope you are ready for your impending judgment.",
"introduction": "A thousand welcomes to our fair nation. I am Selassie, the Ras Tafari Makonnen and Emperor of Ethiopia, your humble servant.",
"tradeRequest": "I request that you consider this offer between our two peoples. I believe it will do us both good.",
"afterPeace": "Today is the day on which we defeated our enemy. However, we shall only rejoice in our hearts, and in the spirit of heaven.",
"neutralHello": "Welcome.",
"neutralLetsHearIt": ["Continue.","I am listening.","Yes?"],
"neutralNo": ["It is not right.","We oppose because it is not right.","But I feel the agreement is done."],
"neutralYes": ["Great.","An agreement has been reached.","Our heart and soul is very much satisfied."],
"hateHello": "What do you want?",
"hateLetsHearIt": ["You said it.","What?","Continue."],
"hateNo": ["That is unacceptable.","You are not sure about it.","Please repeat for me."],
"hateYes": ["Fine, in my understanding.","It is clear.","It is clear."],
"outerColor": [19,70,24],
"innerColor": [255,46,46],
"uniqueName": "Spirit of Adwa",
"uniques": ["[+20]% Strength <when fighting units from a Civilization with more Cities than you>"],
"cities": ["Addis Ababa","Harar","Adwa","Lalibela","Gondar","Axum","Dire Dawa","Bahir Dar","Adama",
"Mek'ele","Awasa","Jimma","Jijiga","Dessie","Debre Berhan","Shashamane","Debre Zeyit","Sodo","Hosaena",
"Nekemte","Asella","Dila","Adigrat","Debre Markos","Kombolcha","Debre Tabor","Sebeta",
"Shire","Ambo","Negele Arsi","Gambela","Ziway","Weldiya"]
},
// City-States sorted by cityStateType, name // City-States sorted by cityStateType, name
{ {

4
android/assets/jsons/Civ V - Vanilla/UnitPromotions.json
View File

@ -538,5 +538,9 @@
{ {
"name": "Pictish Courage", // only for Pictish Warrior and subsequent upgrades "name": "Pictish Courage", // only for Pictish Warrior and subsequent upgrades
"uniques": ["No movement cost to pillage", "+[20]% Strength in [Foreign Land]"] "uniques": ["No movement cost to pillage", "+[20]% Strength in [Foreign Land]"]
},
{
"name": "Home Sweet Home", // only for Mehal Sefari and subsequent upgrades
"uniques": ["[+30]% Strength decreasing with distance from the capital"]
} }
] ]

14
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -1048,6 +1048,20 @@
"promotions": ["March"], "promotions": ["March"],
"attackSound": "shot" "attackSound": "shot"
}, },
{
"name": "Mehal Sefari",
"unitType": "Gunpowder",
"replaces": "Rifleman",
"uniqueTo": "Ethiopia",
"movement": 2,
"strength": 34,
"cost": 200,
"requiredTech": "Rifling",
"obsoleteTech": "Replaceable Parts",
"upgradesTo": "Great War Infantry",
"promotions": ["Drill I","Home Sweet Home"],
"attackSound": "shot"
},
{ {
"name": "Cavalry", "name": "Cavalry",
"unitType": "Mounted", "unitType": "Mounted",

8
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -39,6 +39,14 @@ object BattleDamage {
) { ) {
modifiers.add(getModifierStringFromUnique(unique), unique.params[0].toInt()) modifiers.add(getModifierStringFromUnique(unique), unique.params[0].toInt())
} }
for (unique in combatant.unit.getMatchingUniques(UniqueType.StrengthNearCapital)) {
if (civInfo.cities.isEmpty()) break
val distance = combatant.getTile().aerialDistanceTo(civInfo.getCapital().getCenterTile())
// https://steamcommunity.com/sharedfiles/filedetails/?id=326411722#464287
val effect = unique.params[0].toInt() - 3 * distance
if (effect <= 0) continue
modifiers.add("${unique.sourceObjectName} (${unique.sourceObjectType})", effect)
}
// Deprecated since 3.17.3 // Deprecated since 3.17.3
for (unique in for (unique in

5
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -64,6 +64,11 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
|| (state.unit != null && state.unit.matchesFilter(condition.params[0])) || (state.unit != null && state.unit.matchesFilter(condition.params[0]))
UniqueType.ConditionalAttacking -> state.combatAction == CombatAction.Attack UniqueType.ConditionalAttacking -> state.combatAction == CombatAction.Attack
UniqueType.ConditionalDefending -> state.combatAction == CombatAction.Defend UniqueType.ConditionalDefending -> state.combatAction == CombatAction.Defend
UniqueType.ConditionalVsLargerCiv -> {
val yourCities = state.civInfo?.cities?.size ?: 1
val theirCities = state.defender?.getCivInfo()?.cities?.size ?: 0
yourCities < theirCities
}
UniqueType.ConditionalNeighborTiles -> UniqueType.ConditionalNeighborTiles ->
state.cityInfo != null && state.cityInfo != null &&

2
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -119,6 +119,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) {
///////////////////////////////////////// UNIT UNIQUES ///////////////////////////////////////// ///////////////////////////////////////// UNIT UNIQUES /////////////////////////////////////////
Strength("[amount]% Strength", UniqueTarget.Unit, UniqueTarget.Global), Strength("[amount]% Strength", UniqueTarget.Unit, UniqueTarget.Global),
StrengthNearCapital("[amount]% Strength decreasing with distance from the capital", UniqueTarget.Unit),
@Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING) @Deprecated("As of 3.17.3", ReplaceWith("[amount]% Strength"), DeprecationLevel.WARNING)
StrengthPlus("+[amount]% Strength", UniqueTarget.Unit), StrengthPlus("+[amount]% Strength", UniqueTarget.Unit),
@ -212,6 +213,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) {
ConditionalOurUnit("for [mapUnitFilter] units", UniqueTarget.Conditional), ConditionalOurUnit("for [mapUnitFilter] units", UniqueTarget.Conditional),
ConditionalVsCity("vs cities", UniqueTarget.Conditional), ConditionalVsCity("vs cities", UniqueTarget.Conditional),
ConditionalVsUnits("vs [mapUnitFilter] units", UniqueTarget.Conditional), ConditionalVsUnits("vs [mapUnitFilter] units", UniqueTarget.Conditional),
ConditionalVsLargerCiv("when fighting units from a Civilization with more Cities than you", UniqueTarget.Conditional),
ConditionalAttacking("when attacking", UniqueTarget.Conditional), ConditionalAttacking("when attacking", UniqueTarget.Conditional),
ConditionalDefending("when defending", UniqueTarget.Conditional), ConditionalDefending("when defending", UniqueTarget.Conditional),
// ConditionalIntercepting("when intercepting", UniqueTarget.Conditional), // ConditionalIntercepting("when intercepting", UniqueTarget.Conditional),

45
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -6,14 +6,11 @@ import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit import com.unciv.logic.map.MapUnit
import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetObject import com.unciv.models.ruleset.RulesetObject
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.INamed
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.FormattedLine import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.ui.civilopedia.ICivilopediaText
import com.unciv.ui.utils.Fonts import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.toPercent import com.unciv.ui.utils.toPercent
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
@ -593,8 +590,12 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
power += 4000 power += 4000
// Uniques // Uniques
for (unique in uniqueObjects) { val allUniques = uniqueObjects.asSequence() +
promotions.asSequence()
.mapNotNull { ruleset.unitPromotions[it] }
.flatMap { it.uniqueObjects }
for (unique in allUniques) {
when { when {
unique.isOfType(UniqueType.Strength) && unique.params[0].toInt() > 0 -> { unique.isOfType(UniqueType.Strength) && unique.params[0].toInt() > 0 -> {
if (unique.conditionals.any { it.isOfType(UniqueType.ConditionalVsUnits) } ) { // Bonus vs some units - a quarter of the bonus if (unique.conditionals.any { it.isOfType(UniqueType.ConditionalVsUnits) } ) { // Bonus vs some units - a quarter of the bonus
@ -607,6 +608,9 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
power *= (unique.params[0].toInt() / 2f).toPercent() power *= (unique.params[0].toInt() / 2f).toPercent()
} }
} }
unique.isOfType(UniqueType.StrengthNearCapital) && unique.params[0].toInt() > 0 ->
power *= (unique.params[0].toInt() / 4f).toPercent() // Bonus decreasing with distance from capital - not worth much most of the map???
// Deprecated since 3.17.3 // Deprecated since 3.17.3
unique.isOfType(UniqueType.StrengthPlusVs) && unique.params[1] == "City" // City Attack - half the bonus unique.isOfType(UniqueType.StrengthPlusVs) && unique.params[1] == "City" // City Attack - half the bonus
-> power += (power * unique.params[0].toInt()) / 200 -> power += (power * unique.params[0].toInt()) / 200
@ -623,38 +627,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
-> power += power / 4 -> power += power / 4
unique.placeholderText == "Must set up to ranged attack" // Must set up - 20 % penalty unique.placeholderText == "Must set up to ranged attack" // Must set up - 20 % penalty
-> power -= power / 5 -> power -= power / 5
unique.placeholderText == "+[]% Strength in []" // Bonus in terrain or feature - half the bonus
-> power += (power * unique.params[0].toInt()) / 200
}
}
// Base promotions
for (promotionName in promotions) {
for (unique in ruleset.unitPromotions[promotionName]!!.uniqueObjects) {
when {
unique.isOfType(UniqueType.Strength) && unique.params[0].toInt() > 0 -> {
if (unique.conditionals.any { it.isOfType(UniqueType.ConditionalVsUnits) } ) { // Bonus vs some units - a quarter of the bonus
power *= (unique.params[0].toInt() / 4f).toPercent()
} else if (
unique.conditionals.any { it.isOfType(UniqueType.ConditionalVsCity) } || // City Attack - half the bonus
unique.conditionals.any { it.isOfType(UniqueType.ConditionalAttacking) } || // Attack - half the bonus
unique.conditionals.any { it.isOfType(UniqueType.ConditionalDefending) } // Defense - half the bonus
) {
power *= (unique.params[0].toInt() / 2f).toPercent()
}
}
// Deprecated since 3.17.3
unique.isOfType(UniqueType.StrengthPlusVs) && unique.params[1] == "City" // City Attack - half the bonus
-> power += (power * unique.params[0].toInt()) / 200
unique.isOfType(UniqueType.StrengthPlusVs) && unique.params[1] != "City" // Bonus vs something else - a quarter of the bonus
-> power += (power * unique.params[0].toInt()) / 400
//
// Deprecated since 3.17.4
unique.isOfType(UniqueType.StrengthAttacking) // Attack - half the bonus
-> power += (power * unique.params[0].toInt()) / 200
unique.isOfType(UniqueType.StrengthDefending) // Defense - half the bonus
-> power += (power * unique.params[0].toInt()) / 200
//
unique.placeholderText == "[] additional attacks per turn" // Extra attacks - 20% bonus per extra attack unique.placeholderText == "[] additional attacks per turn" // Extra attacks - 20% bonus per extra attack
-> power += (power * unique.params[0].toInt()) / 5 -> power += (power * unique.params[0].toInt()) / 5
unique.placeholderText == "+[]% Strength in []" // Bonus in terrain or feature - half the bonus unique.placeholderText == "+[]% Strength in []" // Bonus in terrain or feature - half the bonus
@ -662,7 +634,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
} }
} }
}
cachedForceEvaluation = power.toInt() cachedForceEvaluation = power.toInt()
} }
} }

9
docs/Credits.md
View File

@ -100,6 +100,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman * [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman
* [Bayonet](https://thenounproject.com/term/bayonet/3101681/) By food lover for Carolean * [Bayonet](https://thenounproject.com/term/bayonet/3101681/) By food lover for Carolean
* [soldier](https://thenounproject.com/term/soldier/2096497/) by ProSymbols for Mehal Sefari
* [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry * [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry
* [horse racing](https://thenounproject.com/antimso/uploads/?i=2427932) By Sergio Morozov for Cossack * [horse racing](https://thenounproject.com/antimso/uploads/?i=2427932) By Sergio Morozov for Cossack
* [Marching Band](https://thenounproject.com/term/marching-band/871426/) by Darrin Loeliger, US for Hussar. The original work has been modified. * [Marching Band](https://thenounproject.com/term/marching-band/871426/) by Darrin Loeliger, US for Hussar. The original work has been modified.
@ -217,6 +218,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Block](https://thenounproject.com/term/block/1711553/) By Monjin Friends for Stone Works * [Block](https://thenounproject.com/term/block/1711553/) By Monjin Friends for Stone Works
* [korean palace](https://thenounproject.com/term/korean-palace/1797542/) By 1516 for Palace * [korean palace](https://thenounproject.com/term/korean-palace/1797542/) By 1516 for Palace
* [Obelisk](https://thenounproject.com/term/obelisk/749104/) By Eliricon for Monument * [Obelisk](https://thenounproject.com/term/obelisk/749104/) By Eliricon for Monument
* [obelisk](https://thenounproject.com/term/obelisk/3520415/) By IconMark for Stele
* [Cross swords](https://thenounproject.com/term/cross-swords/965398/) By Creaticca Creative Agency for Barracks * [Cross swords](https://thenounproject.com/term/cross-swords/965398/) By Creaticca Creative Agency for Barracks
* [Fortress](https://thenounproject.com/search/?q=fortress&i=146989) By Creative Stall for Krepost * [Fortress](https://thenounproject.com/search/?q=fortress&i=146989) By Creative Stall for Krepost
* [Paper](https://thenounproject.com/term/paper/1443472/) By anam * [Paper](https://thenounproject.com/term/paper/1443472/) By anam
@ -564,7 +566,11 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Iroquois](https://github.com/ravignir/5Hex-Tileset/blob/master/Images/NationIcons/Iroquois.png) by Ravignir for Iroquois * [Iroquois](https://github.com/ravignir/5Hex-Tileset/blob/master/Images/NationIcons/Iroquois.png) by Ravignir for Iroquois
* [Songhai](https://github.com/ravignir/5Hex-Tileset/blob/master/Images/NationIcons/Songhai.png) by Ravignir for Songhai * [Songhai](https://github.com/ravignir/5Hex-Tileset/blob/master/Images/NationIcons/Songhai.png) by Ravignir for Songhai
* [Celtic Knot](https://thenounproject.com/term/celtic/168483/) by Ervin Bolat for the Celts * [Celtic Knot](https://thenounproject.com/term/celtic/168483/) by Ervin Bolat for the Celts
* Ethiopian Icon created in Gimp by Unciv team from the following:
* [Lion](https://thenounproject.com/term/lion/4074339/) by IronSV
* [royal crown](https://thenounproject.com/term/royal-crown/2054222/) by Vectors Market
* [Spear](https://thenounproject.com/term/spear/3930020/) by Firza Alamsyah
* [pennant](https://thenounproject.com/term/pennant/194797/) by Sara Jeffries
## Promotions ## Promotions
@ -598,6 +604,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Anchor](https://thenounproject.com/term/anchor/676586) by Gregor Cresnar for Amphibious * [Anchor](https://thenounproject.com/term/anchor/676586) by Gregor Cresnar for Amphibious
* [survival knife](https://thenounproject.com/search/?q=survival&i=2663392) by b faris for Survivalism * [survival knife](https://thenounproject.com/search/?q=survival&i=2663392) by b faris for Survivalism
* [Shamrock](https://thenounproject.com/term/shamrock/358507/) By P Thanga Vignesh for Pictish Courage * [Shamrock](https://thenounproject.com/term/shamrock/358507/) By P Thanga Vignesh for Pictish Courage
* [home sweet home](https://thenounproject.com/term/home-sweet-home/3817166/) By Silviu Ojog for Home Sweet Home
## Religions ## Religions