Removed legacy tileset code (#7658)

Browse Source

* Removed legacy tileset code

which was only used for the "Default" tileset

* Updated "Default" tileset to support new rendering

* Updated docs

* Fixed fogOfWar coloring bug

* Removed cityImage variable completely

* Renamed variable out to baseHexagon

* Moved color lerp out of for loop

* Renamed "Default" tileset to "Minimal"

* Made "HexaRealm" the games fallback tileset

* Implemented requested changes

* Readded accidentally removed variable

* Reverted updateTileImage back to foreach loop

Since indices are not needed anymore

* Regenerated game.atlas and game.png

...

This commit is contained in:

Leonard Günther

2022-08-22 13:02:52 +02:00

committed by GitHub

parent 86834de82a

commit 18ef8fc20e

67 changed files with 315 additions and 342 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

android/Images/TileSets/Default/AtollOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.7 KiB

BIN

android/Images/TileSets/Default/CityOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

android/Images/TileSets/Default/FalloutOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 9.1 KiB

BIN

android/Images/TileSets/Default/Flood plainsOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.1 KiB

BIN

android/Images/TileSets/Default/ForestOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

BIN

android/Images/TileSets/Default/HillOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

android/Images/TileSets/Default/IceOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

android/Images/TileSets/Default/JungleOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.4 KiB

BIN

android/Images/TileSets/Default/LakesOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

android/Images/TileSets/Default/MarshOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

android/Images/TileSets/Default/MountainOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.5 KiB

BIN

android/Images/TileSets/Default/NaturalWonderOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 20 KiB

BIN

android/Images/TileSets/Default/OasisOverlay.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

BIN

android/Images/TileSets/Default/Tiles/River-Bottom.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 172 B

BIN

android/Images/TileSets/Default/Tiles/River-BottomLeft.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 214 B

BIN

android/Images/TileSets/Default/Tiles/River-BottomRight.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 214 B

0

android/Images/TileSets/Default/Arrows/CityHasAttacked.png → android/Images/TileSets/Minimal/Arrows/CityHasAttacked.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 629 B After Width:  |  Height:  |  Size: 629 B

0

android/Images/TileSets/Default/Arrows/Generic.png → android/Images/TileSets/Minimal/Arrows/Generic.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 843 B After Width:  |  Height:  |  Size: 843 B

0

android/Images/TileSets/Default/Arrows/UnitAttacked.png → android/Images/TileSets/Minimal/Arrows/UnitAttacked.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

0

android/Images/TileSets/Default/Arrows/UnitHasAttacked.png → android/Images/TileSets/Minimal/Arrows/UnitHasAttacked.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 629 B After Width:  |  Height:  |  Size: 629 B

0

android/Images/TileSets/Default/Arrows/UnitMoved.png → android/Images/TileSets/Minimal/Arrows/UnitMoved.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 841 B After Width:  |  Height:  |  Size: 841 B

0

android/Images/TileSets/Default/Arrows/UnitMoving.png → android/Images/TileSets/Minimal/Arrows/UnitMoving.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

android/Images/TileSets/Default/Arrows/UnitTeleported.png → android/Images/TileSets/Minimal/Arrows/UnitTeleported.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

android/Images/TileSets/Default/Arrows/UnitWithdrew.png → android/Images/TileSets/Minimal/Arrows/UnitWithdrew.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 756 B After Width:  |  Height:  |  Size: 756 B

0

android/Images/TileSets/Default/Borders/ConcaveConvexInner.png → android/Images/TileSets/Minimal/Borders/ConcaveConvexInner.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.0 KiB After Width:  |  Height:  |  Size: 9.0 KiB

0

android/Images/TileSets/Default/Borders/ConcaveConvexOuter.png → android/Images/TileSets/Minimal/Borders/ConcaveConvexOuter.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 4.7 KiB

0

android/Images/TileSets/Default/Borders/ConcaveInner.png → android/Images/TileSets/Minimal/Borders/ConcaveInner.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 392 B After Width:  |  Height:  |  Size: 392 B

0

android/Images/TileSets/Default/Borders/ConcaveOuter.png → android/Images/TileSets/Minimal/Borders/ConcaveOuter.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 142 B After Width:  |  Height:  |  Size: 142 B

0

android/Images/TileSets/Default/Borders/ConvexConcaveInner.png → android/Images/TileSets/Minimal/Borders/ConvexConcaveInner.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 389 B After Width:  |  Height:  |  Size: 389 B

0

android/Images/TileSets/Default/Borders/ConvexConcaveOuter.png → android/Images/TileSets/Minimal/Borders/ConvexConcaveOuter.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 142 B After Width:  |  Height:  |  Size: 142 B

0

android/Images/TileSets/Default/Borders/ConvexInner.png → android/Images/TileSets/Minimal/Borders/ConvexInner.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 387 B

0

android/Images/TileSets/Default/Borders/ConvexOuter.png → android/Images/TileSets/Minimal/Borders/ConvexOuter.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 142 B After Width:  |  Height:  |  Size: 142 B

0

android/Images/TileSets/Default/Crosshair.png → android/Images/TileSets/Minimal/Crosshair.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.0 KiB After Width:  |  Height:  |  Size: 6.0 KiB

0

android/Images/TileSets/Default/CrosshatchHexagon.png → android/Images/TileSets/Minimal/CrosshatchHexagon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 39 KiB After Width:  |  Height:  |  Size: 39 KiB

0

android/Images/TileSets/Default/Hexagon.png → android/Images/TileSets/Minimal/Hexagon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

android/Images/TileSets/Default/Highlight.png → android/Images/TileSets/Minimal/Highlight.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 10 KiB

0

android/Images/TileSets/Default/Railroad.png → android/Images/TileSets/Minimal/Railroad.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 613 B After Width:  |  Height:  |  Size: 613 B

0

android/Images/TileSets/Default/Road.png → android/Images/TileSets/Minimal/Road.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 140 B After Width:  |  Height:  |  Size: 140 B

BIN

android/Images/TileSets/Minimal/Tiles/Atoll.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

android/Images/TileSets/Minimal/Tiles/City center.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Fallout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.1 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Flood plains.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Forest.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Hill.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Ice.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Jungle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Lakes.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Marsh.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Mountain.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

android/Images/TileSets/Minimal/Tiles/NaturalWonder.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

android/Images/TileSets/Minimal/Tiles/Oasis.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

android/Images/TileSets/Minimal/Tiles/River-Bottom.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 119 B

BIN

android/Images/TileSets/Minimal/Tiles/River-BottomLeft.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 166 B

BIN

android/Images/TileSets/Minimal/Tiles/River-BottomRight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 165 B