From 86d54bd3fed431fb5715a7f25aba7a0873c2cc0d Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 8 Jun 2020 19:34:25 +0300
Subject: [PATCH] Resolved #2708 - added rivers to plain tileset

---
 .../TileSets/Default/Tiles/River-Bottom.png   | Bin 0 -> 172 bytes
 .../Default/Tiles/River-BottomLeft.png        | Bin 0 -> 214 bytes
 .../Default/Tiles/River-BottomRight.png       | Bin 0 -> 214 bytes
 android/assets/game.atlas                     |  63 ++++++++++++------
 4 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 android/Images/TileSets/Default/Tiles/River-Bottom.png
 create mode 100644 android/Images/TileSets/Default/Tiles/River-BottomLeft.png
 create mode 100644 android/Images/TileSets/Default/Tiles/River-BottomRight.png

diff --git a/android/Images/TileSets/Default/Tiles/River-Bottom.png b/android/Images/TileSets/Default/Tiles/River-Bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf6f6c7833105cd338c52cef956e95186368cd28
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ew!3HE54((L}l8nVc?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtV@O7sn6}?_>$q#R(!kO@RhnZU;4>96^4G
zg(h(dJHLIb*O;vG!6stbf}bp+8E^l4O?zrkaCV|}zbp?AL-K77=J59mmjDf8@O1Ta
JS?83{1OV<)F`57X

literal 0
HcmV?d00001

diff --git a/android/Images/TileSets/Default/Tiles/River-BottomLeft.png b/android/Images/TileSets/Default/Tiles/River-BottomLeft.png
new file mode 100644
index 0000000000000000000000000000000000000000..95f39dcb20c33eb46d718dc5f905c840f75d8ccb
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ew!3HE54((L}l8nVc?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*4NJ7sn6}?_>$q#R(!kO@RhnY%&>d|NoLd
zB_nWvMM>qlom_x>gLC2n8Ad)v2?-AO2HAqM6K4kocyQ<#EJ#pT#H7l_#=4+fgJ+)r
zLu2EaX$21Y?mXu-8W^ium;x0I7QAE>;R;aWWngAzXn$p39>rJ!vX;Tq)z4*}Q$iB}
D!ml_{

literal 0
HcmV?d00001

diff --git a/android/Images/TileSets/Default/Tiles/River-BottomRight.png b/android/Images/TileSets/Default/Tiles/River-BottomRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a9382653e25d2c89af80af9a3ccdc28cdb5720b
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ew!3HE54((L}l8nVc?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjK*4NJ7sn6}?_>$q#R(!kO@RhnZYCFQ{r_q&
zJjJ(MVduAx^%|4^F{D_Y_^x1f*O}q&b7mpdCMPGJ>oPkf7smWze6pauk<q)Qg#AVh
zKa;XDOTo{1dJPkv9=7J{;H;X}%5b7cqxb>C!<OR*7#P@v49w5U_j&-WW$<+Mb6Mw<
G&;$U<^h7ZL

literal 0
HcmV?d00001

diff --git a/android/assets/game.atlas b/android/assets/game.atlas
index d082c5970e..a9a59f9431 100644
--- a/android/assets/game.atlas
+++ b/android/assets/game.atlas
@@ -3118,6 +3118,48 @@ TechIcons/Writing
   orig: 100, 100
   offset: 0, 0
   index: -1
+TileSets/Default/Tiles/River-Bottom
+  rotate: false
+  xy: 718, 46
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/Tiles/River-Bottom
+  rotate: false
+  xy: 718, 46
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/Default/Tiles/River-BottomLeft
+  rotate: false
+  xy: 752, 48
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/Tiles/River-BottomLeft
+  rotate: false
+  xy: 752, 48
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/Default/Tiles/River-BottomRight
+  rotate: false
+  xy: 786, 70
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
+TileSets/FantasyHex/Tiles/River-BottomRight
+  rotate: false
+  xy: 786, 70
+  size: 32, 28
+  orig: 32, 28
+  offset: 0, 0
+  index: -1
 TileSets/Default/road
   rotate: false
   xy: 1226, 909
@@ -3972,27 +4014,6 @@ TileSets/FantasyHex/Tiles/Quarry+Stone
   orig: 32, 28
   offset: 0, 0
   index: -1
-TileSets/FantasyHex/Tiles/River-Bottom
-  rotate: false
-  xy: 718, 46
-  size: 32, 28
-  orig: 32, 28
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Tiles/River-BottomLeft
-  rotate: false
-  xy: 752, 48
-  size: 32, 28
-  orig: 32, 28
-  offset: 0, 0
-  index: -1
-TileSets/FantasyHex/Tiles/River-BottomRight
-  rotate: false
-  xy: 786, 70
-  size: 32, 28
-  orig: 32, 28
-  offset: 0, 0
-  index: -1
 TileSets/FantasyHex/Tiles/Rock of Gibraltar
   rotate: false
   xy: 820, 72