AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-10-01 16:01:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

New river edges and flattened tiles by The Bucketeer!

Browse Source 
Opened River changes in Tile Editor - only visual for now, but should help people see how their tiles would look with rivers surrounding them
This commit is contained in:
Yair Morgenstern 2020-05-16 23:54:16 +03:00
parent 6ed88b54d1
commit 2444b2e1d2
11 changed files with 105 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Tiles/Hill+Forest.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 861 B

After

Width:  |  Height:  |  Size: 982 B

BIN
android/Images/TileSets/FantasyHex/Tiles/Hill.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 634 B

After

Width:  |  Height:  |  Size: 787 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-Bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 172 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-BottomLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 196 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-BottomRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 211 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-Top.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 198 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-TopLeft.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 237 B

BIN
android/Images/TileSets/FantasyHex/Tiles/River-TopRight.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 229 B

227
android/assets/game.atlas
View File

@ -3575,14 +3575,14 @@ TileSets/FantasyHex/Tiles/Hill+Fallout
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Forest TileSets/FantasyHex/Tiles/Hill+Forest
rotate: false rotate: false
xy: 1212, 273 xy: 1212, 290
size: 32, 45 size: 32, 28
orig: 32, 45 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Hill+Forest+Camp TileSets/FantasyHex/Tiles/Hill+Forest+Camp
rotate: false rotate: false
xy: 1212, 226 xy: 1212, 243
size: 32, 45 size: 32, 45
orig: 32, 45 orig: 32, 45
offset: 0, 0 offset: 0, 0
@ -3680,42 +3680,42 @@ TileSets/FantasyHex/Tiles/Landmark
index: -1 index: -1
TileSets/FantasyHex/Tiles/Manufactory TileSets/FantasyHex/Tiles/Manufactory
rotate: false rotate: false
xy: 1502, 755 xy: 992, 101
size: 32, 39 size: 32, 39
orig: 32, 39 orig: 32, 39
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Marble TileSets/FantasyHex/Tiles/Marble
rotate: false rotate: false
xy: 1570, 772 xy: 992, 41
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mine TileSets/FantasyHex/Tiles/Mine
rotate: false rotate: false
xy: 1672, 732 xy: 1502, 766
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Moai TileSets/FantasyHex/Tiles/Moai
rotate: false rotate: false
xy: 1570, 741 xy: 1570, 771
size: 32, 29 size: 32, 29
orig: 32, 29 orig: 32, 29
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mount Fuji TileSets/FantasyHex/Tiles/Mount Fuji
rotate: false rotate: false
xy: 1638, 710 xy: 1638, 738
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Mountain TileSets/FantasyHex/Tiles/Mountain
rotate: false rotate: false
xy: 1672, 694 xy: 1672, 726
size: 32, 36 size: 32, 36
orig: 32, 36 orig: 32, 36
offset: 0, 0 offset: 0, 0
@ -3750,420 +3750,399 @@ TileSets/FantasyHex/Tiles/Oil
index: -1 index: -1
TileSets/FantasyHex/Tiles/Oil well TileSets/FantasyHex/Tiles/Oil well
rotate: false rotate: false
xy: 1486, 725 xy: 1486, 736
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Old Faithful TileSets/FantasyHex/Tiles/Old Faithful
rotate: false rotate: false
xy: 1486, 691 xy: 1486, 702
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture TileSets/FantasyHex/Tiles/Pasture
rotate: false rotate: false
xy: 1520, 712 xy: 1298, 596
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture+Cattle TileSets/FantasyHex/Tiles/Pasture+Cattle
rotate: false rotate: false
xy: 1486, 657 xy: 1298, 532
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture+Horses TileSets/FantasyHex/Tiles/Pasture+Horses
rotate: false rotate: false
xy: 1520, 648 xy: 1298, 498
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture+Sheep TileSets/FantasyHex/Tiles/Pasture+Sheep
rotate: false rotate: false
xy: 1554, 707 xy: 1332, 592
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pasture2 TileSets/FantasyHex/Tiles/Pasture2
rotate: false rotate: false
xy: 1520, 682 xy: 1298, 566
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Pearls TileSets/FantasyHex/Tiles/Pearls
rotate: false rotate: false
xy: 1554, 677 xy: 1332, 562
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains TileSets/FantasyHex/Tiles/Plains
rotate: false rotate: false
xy: 1588, 673 xy: 1298, 468
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+City TileSets/FantasyHex/Tiles/Plains+City
rotate: false rotate: false
xy: 1588, 636 xy: 1332, 465
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Fallout TileSets/FantasyHex/Tiles/Plains+Fallout
rotate: false rotate: false
xy: 1622, 680 xy: 1452, 678
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Farm TileSets/FantasyHex/Tiles/Plains+Farm
rotate: false rotate: false
xy: 1622, 650 xy: 1450, 648
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest TileSets/FantasyHex/Tiles/Plains+Forest
rotate: false rotate: false
xy: 1656, 659 xy: 1486, 667
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Camp TileSets/FantasyHex/Tiles/Plains+Forest+Camp
rotate: false rotate: false
xy: 1690, 659 xy: 1520, 731
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Deer
rotate: false rotate: false
xy: 992, 107 xy: 1520, 696
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs TileSets/FantasyHex/Tiles/Plains+Forest+Camp+Furs
rotate: false rotate: false
xy: 992, 72 xy: 1520, 661
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill
rotate: false rotate: false
xy: 992, 37 xy: 1484, 632
size: 32, 33 size: 32, 33
orig: 32, 33 orig: 32, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle TileSets/FantasyHex/Tiles/Plains+Jungle
rotate: false rotate: false
xy: 992, 3 xy: 1518, 627
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post
rotate: false rotate: false
xy: 1622, 616 xy: 1450, 614
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation TileSets/FantasyHex/Tiles/Plantation
rotate: false rotate: false
xy: 1656, 629 xy: 1484, 602
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Bananas TileSets/FantasyHex/Tiles/Plantation+Bananas
rotate: false rotate: false
xy: 1690, 629 xy: 1518, 597
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Cotton TileSets/FantasyHex/Tiles/Plantation+Cotton
rotate: false rotate: false
xy: 1656, 599 xy: 1554, 741
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Dyes TileSets/FantasyHex/Tiles/Plantation+Dyes
rotate: false rotate: false
xy: 1690, 599 xy: 1554, 711
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Incense TileSets/FantasyHex/Tiles/Plantation+Incense
rotate: false rotate: false
xy: 1450, 620 xy: 1554, 681
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Silk TileSets/FantasyHex/Tiles/Plantation+Silk
rotate: false rotate: false
xy: 1484, 627 xy: 1554, 651
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Spices TileSets/FantasyHex/Tiles/Plantation+Spices
rotate: false rotate: false
xy: 1518, 618 xy: 1552, 621
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Sugar TileSets/FantasyHex/Tiles/Plantation+Sugar
rotate: false rotate: false
xy: 1552, 617 xy: 1552, 591
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Plantation+Wine TileSets/FantasyHex/Tiles/Plantation+Wine
rotate: false rotate: false
xy: 1586, 606 xy: 1588, 733
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Polder TileSets/FantasyHex/Tiles/Polder
rotate: false rotate: false
xy: 1484, 597 xy: 1588, 703
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Quarry TileSets/FantasyHex/Tiles/Quarry
rotate: false rotate: false
xy: 1518, 588 xy: 1588, 673
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Quarry+Marble TileSets/FantasyHex/Tiles/Quarry+Marble
rotate: false rotate: false
xy: 1552, 587 xy: 1588, 643
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Quarry+Stone TileSets/FantasyHex/Tiles/Quarry+Stone
rotate: false rotate: false
xy: 1586, 576 xy: 1586, 613
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-Bottom TileSets/FantasyHex/Tiles/River-Bottom
rotate: false rotate: false
xy: 1654, 567 xy: 1622, 708
size: 32, 30 size: 32, 28
orig: 32, 30 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-BottomLeft TileSets/FantasyHex/Tiles/River-BottomLeft
rotate: false rotate: false
xy: 1688, 567 xy: 1622, 678
size: 32, 30 size: 32, 28
orig: 32, 30 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/River-BottomRight TileSets/FantasyHex/Tiles/River-BottomRight
rotate: false rotate: false
xy: 1620, 554 xy: 1622, 648
size: 32, 30 size: 32, 28
orig: 32, 30 orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-Top
rotate: false
xy: 1654, 535
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-TopLeft
rotate: false
xy: 1688, 535
size: 32, 30
orig: 32, 30
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-TopRight
rotate: false
xy: 2004, 962
size: 32, 30
orig: 32, 30
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Rock of Gibraltar TileSets/FantasyHex/Tiles/Rock of Gibraltar
rotate: false rotate: false
xy: 2004, 928 xy: 1656, 692
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Sheep TileSets/FantasyHex/Tiles/Sheep
rotate: false rotate: false
xy: 1874, 860 xy: 1622, 618
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Silk TileSets/FantasyHex/Tiles/Silk
rotate: false rotate: false
xy: 1942, 853 xy: 1656, 602
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Silver TileSets/FantasyHex/Tiles/Silver
rotate: false rotate: false
xy: 1976, 853 xy: 1690, 696
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Snow TileSets/FantasyHex/Tiles/Snow
rotate: false rotate: false
xy: 1942, 823 xy: 1690, 608
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Spices TileSets/FantasyHex/Tiles/Spices
rotate: false rotate: false
xy: 2010, 810 xy: 1620, 560
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Stone TileSets/FantasyHex/Tiles/Stone
rotate: false rotate: false
xy: 1314, 626 xy: 1654, 542
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Sugar TileSets/FantasyHex/Tiles/Sugar
rotate: false rotate: false
xy: 1382, 616 xy: 1688, 550
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Trading post TileSets/FantasyHex/Tiles/Trading post
rotate: false rotate: false
xy: 1552, 557 xy: 2010, 874
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra TileSets/FantasyHex/Tiles/Tundra
rotate: false rotate: false
xy: 1298, 596 xy: 1942, 853
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+City TileSets/FantasyHex/Tiles/Tundra+City
rotate: false rotate: false
xy: 1298, 559 xy: 1976, 846
size: 32, 35 size: 32, 35
orig: 32, 35 orig: 32, 35
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Fallout TileSets/FantasyHex/Tiles/Tundra+Fallout
rotate: false rotate: false
xy: 1298, 529 xy: 2010, 844
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest TileSets/FantasyHex/Tiles/Tundra+Forest
rotate: false rotate: false
xy: 1298, 495 xy: 1908, 828
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Camp TileSets/FantasyHex/Tiles/Tundra+Forest+Camp
rotate: false rotate: false
xy: 1298, 461 xy: 1942, 819
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Deer
rotate: false rotate: false
xy: 1332, 592 xy: 1976, 812
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs
rotate: false rotate: false
xy: 1332, 558 xy: 2010, 810
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill
rotate: false rotate: false
xy: 1332, 524 xy: 1010, 207
size: 32, 32 size: 32, 32
orig: 32, 32 orig: 32, 32
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Uranium TileSets/FantasyHex/Tiles/Uranium
rotate: false rotate: false
xy: 1332, 466 xy: 1010, 149
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Whales TileSets/FantasyHex/Tiles/Whales
rotate: false rotate: false
xy: 1366, 500 xy: 1026, 33
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Wheat TileSets/FantasyHex/Tiles/Wheat
rotate: false rotate: false
xy: 1366, 470 xy: 1026, 3
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Tiles/Wine TileSets/FantasyHex/Tiles/Wine
rotate: false rotate: false
xy: 1400, 579 xy: 1706, 860
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/TopBorder TileSets/FantasyHex/TopBorder
rotate: false rotate: false
xy: 1518, 558 xy: 2010, 904
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
@ -4548,56 +4527,56 @@ TileSets/FantasyHex/Units/Legion
index: -1 index: -1
TileSets/FantasyHex/Units/Longbowman TileSets/FantasyHex/Units/Longbowman
rotate: false rotate: false
xy: 1638, 772 xy: 1212, 213
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Longswordsman TileSets/FantasyHex/Units/Longswordsman
rotate: false rotate: false
xy: 1672, 762 xy: 1638, 772
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mandekalu Cavalry TileSets/FantasyHex/Units/Mandekalu Cavalry
rotate: false rotate: false
xy: 1468, 768 xy: 1672, 764
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Maori Warrior TileSets/FantasyHex/Units/Maori Warrior
rotate: false rotate: false
xy: 1536, 772 xy: 992, 71
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Marine TileSets/FantasyHex/Units/Marine
rotate: false rotate: false
xy: 1604, 763 xy: 992, 11
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mechanized Infantry TileSets/FantasyHex/Units/Mechanized Infantry
rotate: false rotate: false
xy: 1638, 744 xy: 1468, 768
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Minuteman TileSets/FantasyHex/Units/Minuteman
rotate: false rotate: false
xy: 1536, 742 xy: 1536, 772
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Mohawk Warrior TileSets/FantasyHex/Units/Mohawk Warrior
rotate: false rotate: false
xy: 1604, 733 xy: 1604, 763
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
@ -4632,154 +4611,154 @@ TileSets/FantasyHex/Units/Norwegian Ski Infantry
index: -1 index: -1
TileSets/FantasyHex/Units/Panzer TileSets/FantasyHex/Units/Panzer
rotate: false rotate: false
xy: 1452, 680 xy: 1296, 626
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Paratrooper TileSets/FantasyHex/Units/Paratrooper
rotate: false rotate: false
xy: 1450, 650 xy: 1330, 626
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Persian Immortal TileSets/FantasyHex/Units/Persian Immortal
rotate: false rotate: false
xy: 1554, 647 xy: 1332, 532
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Pikeman TileSets/FantasyHex/Units/Pikeman
rotate: false rotate: false
xy: 1588, 703 xy: 1332, 502
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Rifleman TileSets/FantasyHex/Units/Rifleman
rotate: false rotate: false
xy: 1620, 586 xy: 1586, 583
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Rocket Artillery TileSets/FantasyHex/Units/Rocket Artillery
rotate: false rotate: false
xy: 2010, 898 xy: 1656, 662
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Scout TileSets/FantasyHex/Units/Scout
rotate: false rotate: false
xy: 2010, 868 xy: 1656, 632
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Ship of the Line TileSets/FantasyHex/Units/Ship of the Line
rotate: false rotate: false
xy: 1908, 862 xy: 1620, 590
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Sipahi TileSets/FantasyHex/Units/Sipahi
rotate: false rotate: false
xy: 2010, 840 xy: 1690, 668
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Slinger TileSets/FantasyHex/Units/Slinger
rotate: false rotate: false
xy: 1908, 832 xy: 1690, 638
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Spearman TileSets/FantasyHex/Units/Spearman
rotate: false rotate: false
xy: 1976, 823 xy: 1654, 572
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Submarine TileSets/FantasyHex/Units/Submarine
rotate: false rotate: false
xy: 1348, 628 xy: 1690, 580
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Swordsman TileSets/FantasyHex/Units/Swordsman
rotate: false rotate: false
xy: 1416, 609 xy: 1688, 520
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Tank TileSets/FantasyHex/Units/Tank
rotate: false rotate: false
xy: 1450, 590 xy: 2004, 964
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Tercio TileSets/FantasyHex/Units/Tercio
rotate: false rotate: false
xy: 1484, 567 xy: 2004, 934
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Trebuchet TileSets/FantasyHex/Units/Trebuchet
rotate: false rotate: false
xy: 1586, 546 xy: 1874, 860
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Trireme TileSets/FantasyHex/Units/Trireme
rotate: false rotate: false
xy: 1620, 526 xy: 1908, 862
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Turtle Ship TileSets/FantasyHex/Units/Turtle Ship
rotate: false rotate: false
xy: 1332, 496 xy: 1010, 179
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/War Chariot TileSets/FantasyHex/Units/War Chariot
rotate: false rotate: false
xy: 1366, 586 xy: 1026, 119
size: 32, 28 size: 32, 28
orig: 32, 28 orig: 32, 28
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/War Elephant TileSets/FantasyHex/Units/War Elephant
rotate: false rotate: false
xy: 1366, 558 xy: 1026, 91
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/WaterUnit TileSets/FantasyHex/Units/WaterUnit
rotate: false rotate: false
xy: 1366, 530 xy: 1026, 63
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0
index: -1 index: -1
TileSets/FantasyHex/Units/Work Boats TileSets/FantasyHex/Units/Work Boats
rotate: false rotate: false
xy: 1400, 551 xy: 1706, 832
size: 32, 26 size: 32, 26
orig: 32, 26 orig: 32, 26
offset: 0, 0 offset: 0, 0

BIN
android/assets/game2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 KiB

After

Width:  |  Height:  |  Size: 471 KiB

4
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -191,7 +191,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
addTerrainOptions(terrainFeaturesTable, baseTerrainTable) addTerrainOptions(terrainFeaturesTable, baseTerrainTable)
// addRiverToggleOptions(baseTerrainTable) addRiverToggleOptions(baseTerrainTable)
val resources = getResourceActors() val resources = getResourceActors()
@ -261,7 +261,6 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
private fun addTerrainOptions(terrainFeaturesTable: Table, baseTerrainTable: Table) { private fun addTerrainOptions(terrainFeaturesTable: Table, baseTerrainTable: Table) {
for (terrain in ruleset.terrains.values) { for (terrain in ruleset.terrains.values) {
val tileInfo = TileInfo() val tileInfo = TileInfo()
tileInfo.ruleset = mapEditorScreen.ruleset
if (terrain.type == TerrainType.TerrainFeature) { if (terrain.type == TerrainType.TerrainFeature) {
tileInfo.baseTerrain = when { tileInfo.baseTerrain = when {
terrain.occursOn != null -> terrain.occursOn.first() terrain.occursOn != null -> terrain.occursOn.first()
@ -332,6 +331,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
} }
private fun makeTileGroup(tileInfo: TileInfo): TileGroup { private fun makeTileGroup(tileInfo: TileInfo): TileGroup {
tileInfo.ruleset = mapEditorScreen.ruleset
tileInfo.setTerrainTransients() tileInfo.setTerrainTransients()
val group = TileGroup(tileInfo, TileSetStrings()) val group = TileGroup(tileInfo, TileSetStrings())
group.showEntireMap = true group.showEntireMap = true