From 3697f761b3aea8b687a006cc19153849fd087507 Mon Sep 17 00:00:00 2001
From: Shadow <1140613+Shadowss@users.noreply.github.com>
Date: Mon, 11 Jun 2018 11:02:44 +0300
Subject: [PATCH] Update oasis images

+update oasis images
+thanks @velhbxtyrj
---
 Templates/Profile/overview.tpl            |  19 ++++---
 gpack/travian_default/img/a/resNew2.png   | Bin 0 -> 2854 bytes
 gpack/travian_default/lang/en/compact.css |  59 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 gpack/travian_default/img/a/resNew2.png

diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl
index 9c23c758..7b533045 100644
--- a/Templates/Profile/overview.tpl
+++ b/Templates/Profile/overview.tpl
@@ -169,7 +169,7 @@ if($displayarray['vac_mode'] == 1) echo "<tr><th colspan='2'><font color='Maroon
     	$coor = $database->getCoor($vil['wref']);
     	echo "<tr><td class=\"nam\"><a href=\"karte.php?d=".$vil['wref']."&amp;c=".$generator->getMapCheck($vil['wref'])."\">".$vil['name']."</a>";
     	if($vil['capital'] == 1) echo "<span class=\"none3\"> (capital)</span>";
-		echo "<td class=\"oases\">";
+		echo "<td class=\"hab\">";
 		
 		// OASIS PART - must to be activated from install part
 	       
@@ -178,28 +178,31 @@ if($displayarray['vac_mode'] == 1) echo "<tr><th colspan='2'><font color='Maroon
             switch ($oasis['type']) {
                 case 1:
                 case 2:
-                    echo "<img class='r1' src='img/x.gif' title='+25% Lumber'> ";
+                    echo "<img class='r100' src='img/x.gif' title='+25% Lumber'> ";
                     break;
                 case 3:
-                    echo "<img class='r1' src='img/x.gif' title='+25% Lumber'><img class='r4' src='img/x.gif' title='+25% Crop'> ";
+                    echo "<img class='r200' src='img/x.gif' title='+25% Lumber +25% Crop'> ";
                     break;
                 case 4:
                 case 5:
-                    echo "<img class='r2' src='img/x.gif' title='+25% Clay'> ";
+                    echo "<img class='r400' src='img/x.gif' title='+25% Clay'> ";
                     break;
                 case 6:
-                    echo "<img class='r2' src='img/x.gif' title='+25% Clay'><img class='r4' src='img/x.gif' title='+25% Crop'> ";
+                    echo "<img class='r500' src='img/x.gif' title='+25% Clay +25% Crop'> ";
+                    break;
                 case 7:
                 case 8:
-                    echo "<img class='r3' src='img/x.gif' title='+25% Iron'> ";
+                    echo "<img class='r700' src='img/x.gif' title='+25% Iron'> ";
                     break;
                 case 9:
-                    echo "<img class='r3' src='img/x.gif' title='+25% Iron'><img class='r4' src='img/x.gif' title='+25% Crop'> ";
+                    echo "<img class='r800' src='img/x.gif' title='+25% Iron +25% Crop'> ";
                     break;
                 case 10:
                 case 11:
+                    echo "<img class='r1000' src='img/x.gif' title='+25% Crop'> ";
+                    break;
                 case 12:
-                    echo "<img class='r4' src='img/x.gif' title='+50% Crop'> ";
+                    echo "<img class='r1100' src='img/x.gif' title='+50% Crop'> ";
                     break;
             }
         }
diff --git a/gpack/travian_default/img/a/resNew2.png b/gpack/travian_default/img/a/resNew2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a3edfe6c7fc66124b5969463e2b48098e3faa6b
GIT binary patch
literal 2854
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
Ef;uZV_y7O^

literal 0
HcmV?d00001

diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css
index 9e7aaa3e..3d3a8ce4 100644
--- a/gpack/travian_default/lang/en/compact.css
+++ b/gpack/travian_default/lang/en/compact.css
@@ -6678,6 +6678,65 @@ img.r4 {
 img.r5 {
     background-position: -84px 0;
 }
+img.r100,
+img.r200,
+img.r300,
+img.r400,
+img.r500,
+img.r600,
+img.r700,
+img.r800,
+img.r900,
+img.r1000,
+img.r1100 {
+  height: 21px;
+  width: 25px;
+  background-image: url(../../img/a/resNew2.png);
+}
+
+img.r100 {
+  background-position: 0px 0px;
+}
+
+img.r200 {
+  background-position: 0px -21px;
+}
+
+img.r300 {
+  background-position: 0px -42px;
+}
+
+img.r400 {
+  background-position: 0px -63px;
+}
+
+img.r500 {
+  background-position: 0px -84px;
+}
+
+img.r600 {
+  background-position: 0px -105px;
+}
+
+img.r700 {
+  background-position: 0px -126px;
+}
+
+img.r800 {
+  background-position: 0px -147px;
+}
+
+img.r900 {
+  background-position: 0px -168px;
+}
+
+img.r1000 {
+  background-position: 0px -189px;
+}
+
+img.r1100 {
+  background-position: 0px -210px;
+}
 img.attack_symbol_grey, img.attack_symbol_green, img.attack_symbol_yellow, img.attack_symbol_red {
     background-image: url("../../img/a/mark_attack.gif");
     height: 12px;