From c938aa47ef75784c90e54dd12b6e448f72cb357e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sat, 17 May 2014 03:00:54 +0200
Subject: [PATCH] Fixed tier derp, adjusted slot count and in robots. Switched
 upgrade icons back.

---
 .../textures/items/icon_upgrade.png             | Bin 446 -> 304 bytes
 .../textures/items/icon_upgrade_dynamic.png     | Bin 304 -> 446 bytes
 src/main/scala/li/cil/oc/Settings.scala         |   2 +-
 .../scala/li/cil/oc/common/InventorySlots.scala |  10 +++++-----
 .../driver/item/UpgradeContainerFloppy.scala    |   2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png
index 7d27810c1e0f8a1fd80c8e9068d4c0e747a7627c..885ab17b19cdde0bb4d9bfcf3d2d0f951d747f14 100644
GIT binary patch
delta 240
zcmV<M01yAZ1F!;+NPhs*Nkl<Zc-mt8|NlP&C4h;6LcoGgGAu020m?kEYSk*NY8cVI
zuyNx?Fuio?QisgUOoqdU4>Mf3as_NibaXU>zrR0WFTgZ^`t*rGUtga=M@I)F>;M!e
z90tgmVL(|~8Ey#BTeuAX`5B}c8<3Ke#A*l=vgUjD?lF{>mTBS))b{3y44c>QWdN#k
zz~+JjAgrXMgg4qMYx56Wy?Fls+35h}3anuOisv(D&JbnD_up@+ml7#903#)un3y<V
qQwR(=cwlSmE5g0YIN-SvAiw||{#J}kt#hUT0000<MNUMnLSTZG&1<v(

delta 383
zcmV-_0f7Fn0=@%~NPhufNkl<Zc-o{>F;2rU6m?J;7^)0RWh0#`BC+HE?j>@8OhICd
z#1?f!>WIXa3-lB|K$Z-wK|%pBU_z1sB#?@qRhyrrO#PDmoo~PA=V!;+Znx}^n4nA3
zlp|MF)tl_PuJ_$Ejm}a^o%1{w6EnG5twb1xJ-}wO(b?2p*MGISEK9xV5d|z33$B_5
zPN!1<Ihr9uO*M}E`rI;0K%@(FQ4~QwkK>s6zK;?|jjl0a6+ossh9)!Mwr$ybKG!6u
zVO^GGtSE{x0VL9$X`IbwmLv#*@hup)_kk(NF1RvK$T#^%U_wo>BuVsmy<YbSuCH$F
z`14z`ljGB|2Y8<63EZv9dsW=s-@-s)z?Q%~5cn{B3quvy{o?X`Y$AOy{{_It#IK+C
zy&iBJgL;8@C?4sUD+Qu=3nVlcB>2FMESJln5J3qY{EbQ$rz`5Z9?5@s`mkdoUtxuF
d=<ob1zyKZ)vJN{P!czbM002ovPDHLkV1lT-vEBdx

diff --git a/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png b/src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png
index 885ab17b19cdde0bb4d9bfcf3d2d0f951d747f14..7d27810c1e0f8a1fd80c8e9068d4c0e747a7627c 100644
GIT binary patch
delta 383
zcmV-_0f7Fn0=@%~NPhufNkl<Zc-o{>F;2rU6m?J;7^)0RWh0#`BC+HE?j>@8OhICd
z#1?f!>WIXa3-lB|K$Z-wK|%pBU_z1sB#?@qRhyrrO#PDmoo~PA=V!;+Znx}^n4nA3
zlp|MF)tl_PuJ_$Ejm}a^o%1{w6EnG5twb1xJ-}wO(b?2p*MGISEK9xV5d|z33$B_5
zPN!1<Ihr9uO*M}E`rI;0K%@(FQ4~QwkK>s6zK;?|jjl0a6+ossh9)!Mwr$ybKG!6u
zVO^GGtSE{x0VL9$X`IbwmLv#*@hup)_kk(NF1RvK$T#^%U_wo>BuVsmy<YbSuCH$F
z`14z`ljGB|2Y8<63EZv9dsW=s-@-s)z?Q%~5cn{B3quvy{o?X`Y$AOy{{_It#IK+C
zy&iBJgL;8@C?4sUD+Qu=3nVlcB>2FMESJln5J3qY{EbQ$rz`5Z9?5@s`mkdoUtxuF
d=<ob1zyKZ)vJN{P!czbM002ovPDHLkV1lT-vEBdx

delta 240
zcmV<M01yAZ1F!;+NPhs*Nkl<Zc-mt8|NlP&C4h;6LcoGgGAu020m?kEYSk*NY8cVI
zuyNx?Fuio?QisgUOoqdU4>Mf3as_NibaXU>zrR0WFTgZ^`t*rGUtga=M@I)F>;M!e
z90tgmVL(|~8Ey#BTeuAX`5B}c8<3Ke#A*l=vgUjD?lF{>mTBS))b{3y44c>QWdN#k
zz~+JjAgrXMgg4qMYx56Wy?Fls+35h}3anuOisv(D&JbnD_up@+ml7#903#)un3y<V
qQwR(=cwlSmE5g0YIN-SvAiw||{#J}kt#hUT0000<MNUMnLSTZG&1<v(

diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala
index c9185db10..b96608595 100644
--- a/src/main/scala/li/cil/oc/Settings.scala
+++ b/src/main/scala/li/cil/oc/Settings.scala
@@ -199,7 +199,7 @@ object Settings {
   val screenResolutionsByTier = Array((50, 16), (80, 25), (160, 50))
   val screenDepthsByTier = Array(ColorDepth.OneBit, ColorDepth.FourBit, ColorDepth.EightBit)
   val hologramMaxScaleByTier = Array(3, 4)
-  val robotComplexityByTier = Array(16, 24, 32)
+  val robotComplexityByTier = Array(12, 24, 32)
 
   // Power conversion values. These are the same values used by Universal
   // Electricity to provide global power support.
diff --git a/src/main/scala/li/cil/oc/common/InventorySlots.scala b/src/main/scala/li/cil/oc/common/InventorySlots.scala
index 12b249af2..1829dc5c4 100644
--- a/src/main/scala/li/cil/oc/common/InventorySlots.scala
+++ b/src/main/scala/li/cil/oc/common/InventorySlots.scala
@@ -107,12 +107,12 @@ object InventorySlots {
       InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
-      InventorySlot(Slot.Upgrade, Tier.Three),
       InventorySlot(Slot.Upgrade, Tier.Two),
       InventorySlot(Slot.Upgrade, Tier.Two),
       InventorySlot(Slot.Upgrade, Tier.Two),
+      InventorySlot(Slot.Upgrade, Tier.One),
+      InventorySlot(Slot.Upgrade, Tier.One),
+      InventorySlot(Slot.Upgrade, Tier.One),
       InventorySlot(Slot.Card, Tier.Three),
       InventorySlot(Slot.Card, Tier.Two),
       InventorySlot(Slot.Card, Tier.Two),
@@ -173,11 +173,11 @@ object InventorySlots {
   )
 
   object Tier {
-    val None = -2
-    val Any = -1
+    val None = -1
     val One = 0
     val Two = 1
     val Three = 2
+    val Any = Int.MaxValue
   }
 
   case class InventorySlot(slot: Slot, tier: Int)
diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
index d9cc028b1..cfb8da384 100644
--- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
+++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
@@ -14,5 +14,5 @@ object UpgradeContainerFloppy extends Item with UpgradeContainer {
 
   override def providedSlot(stack: ItemStack) = Slot.Disk
 
-  override def providedTier(stack: ItemStack) = -1 // Any
+  override def providedTier(stack: ItemStack) = Int.MaxValue // Any
 }