From 98d551559b8418f1ba23a130f3be6fa611133ffc Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 3 Jun 2021 21:50:30 +0300
Subject: [PATCH] Resolves #3926 - Wheat+Farm gets location-appropriate farm

---
 .../TileSets/FantasyHex/Tiles/Wheat+Farm.png      | Bin 657 -> 0 bytes
 android/assets/jsons/TileSets/FantasyHex.json     |   4 ++++
 2 files changed, 4 insertions(+)
 delete mode 100644 android/Images/TileSets/FantasyHex/Tiles/Wheat+Farm.png

diff --git a/android/Images/TileSets/FantasyHex/Tiles/Wheat+Farm.png b/android/Images/TileSets/FantasyHex/Tiles/Wheat+Farm.png
deleted file mode 100644
index 8efbff5723ddf31bfa89e010cf6442a0cf79e0d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq001BW000~a1^@s60K&Z@00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wzgBK~zXfy_LU8
z13?hRHw&>y6SRpK?JcwjLhupt9zKBJ3y6)Cg|>=MU@asFmLh?WLJRAJK+-50h+s6j
z-`ve{e|GnFL*fr)?j*P0%r~>U1(Cz#TK<YR^{}e`Y*8`YSr^5@P)w`ISUQ*)bz~T|
zOwN?}k})Pgl`n|*=7w=Cs{@O~RFF0SoAtFpMbsvh@J$i+pJrhWG6}d?FJD*0-qTj_
zqJ%MgQ6d&}t#E2Vyy9+kBpw@6(b??>!j8Z>9oYmlm7rq$-zun_C_WFvmn>Lgzgf&U
zoJfEyN?WQTD)#Ady&Y(zV`sBZF+O8a0-4^kpocJk)u@&uW(5%~(?JQ?_Ngxro2`9O
z1Q6!R<8Z;&A#|N?2ET_`w=^;er;#q(&I^y0VHT_o5Nbi&bnEbOE<b^JadbkqZp(CK
z+VGtPS6UC{zyT!j->|0ajmPw`4Dy_VwmiK1F5tnX6^jDaLlfH60zAAlPACbSV0?5g
z6KEnvyP$M)L=h(#AEDTO9DU#d65pW}YG+*hoKy8olmKUR+WVjrjL+`q3^$wy>1&qn
z00`0ysP8y}?dEZ$1rq0g(?Dv53fC+^f;fhax2O6xt&vConbAP1Au+;EsKsD4Uq11Q
zbzr`(S~5{RNF)IG2f1g15<<10U00tNgu(sgC&jcl$Rq%qS`mVIaT!w6n%V>+7i_Iy
rxN^;G0CrMWJ<uiqd|b%Gyp|Au8T%K9G)k--00000NkvXXu0mjfCkq$a

diff --git a/android/assets/jsons/TileSets/FantasyHex.json b/android/assets/jsons/TileSets/FantasyHex.json
index 34919a97ac..706d565a12 100644
--- a/android/assets/jsons/TileSets/FantasyHex.json
+++ b/android/assets/jsons/TileSets/FantasyHex.json
@@ -61,6 +61,7 @@
         "Plains+Forest+Uranium": ["Plains","Uranium","PlainsForest"],
         "Plains+Forest+Deer": ["Plains","Deer","PlainsForest"],
         "Plains+Forest+Furs": ["Plains","Furs","PlainsForest"],
+        "Plains+Wheat+Farm": ["Plains+Farm"],
         //Plains+Hill
         "Plains+Hill+Forest+Horses": ["Plains","Hill","Horses","Forest"],
         "Plains+Hill+Forest+Iron": ["Plains","Hill","Iron","Forest"],
@@ -87,6 +88,9 @@
         "Tundra+Hill+Forest+Furs": ["Tundra","Hill","Furs","TundraForest"],
         "Tundra+Hill+Forest+Deer": ["Tundra","Hill","Deer","TundraForest"],
 		
+        "Desert+Wheat+Farm": ["Desert+Farm"],
+        "Desert+Flood plains+Wheat+Farm": ["Desert+Flood plains+Farm"],
+		
         "Grassland+Forest+Ancient ruins": ["Grassland","Ancient ruins", "GrasslandForest"],
         "Grassland+Cattle+Ancient ruins": ["Grassland","Ancient ruins","Cattle"],
         "Grassland+Sheep+Ancient ruins": ["Grassland","Ancient ruins","Sheep"],