AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tier derp, adjusted slot count and in robots.

Browse Source 
Switched upgrade icons back.
This commit is contained in:
Florian Nücke 2014-05-17 03:00:54 +02:00
parent 50ea74ddee
commit c938aa47ef
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/main/resources/assets/opencomputers/textures/items/icon_upgrade.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 304 B

BIN
src/main/resources/assets/opencomputers/textures/items/icon_upgrade_dynamic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 446 B

2
src/main/scala/li/cil/oc/Settings.scala
View File

@ -199,7 +199,7 @@ object Settings {
val screenResolutionsByTier = Array((50, 16), (80, 25), (160, 50)) val screenResolutionsByTier = Array((50, 16), (80, 25), (160, 50))
val screenDepthsByTier = Array(ColorDepth.OneBit, ColorDepth.FourBit, ColorDepth.EightBit) val screenDepthsByTier = Array(ColorDepth.OneBit, ColorDepth.FourBit, ColorDepth.EightBit)
val hologramMaxScaleByTier = Array(3, 4) 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 // Power conversion values. These are the same values used by Universal
// Electricity to provide global power support. // Electricity to provide global power support.

10
src/main/scala/li/cil/oc/common/InventorySlots.scala
View File

@ -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.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.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.Three),
InventorySlot(Slot.Card, Tier.Two), InventorySlot(Slot.Card, Tier.Two),
InventorySlot(Slot.Card, Tier.Two), InventorySlot(Slot.Card, Tier.Two),
@ -173,11 +173,11 @@ object InventorySlots {
) )
object Tier { object Tier {
val None = -2 val None = -1
val Any = -1
val One = 0 val One = 0
val Two = 1 val Two = 1
val Three = 2 val Three = 2
val Any = Int.MaxValue
} }
case class InventorySlot(slot: Slot, tier: Int) case class InventorySlot(slot: Slot, tier: Int)

2
src/main/scala/li/cil/oc/server/driver/item/UpgradeContainerFloppy.scala
View File

@ -14,5 +14,5 @@ object UpgradeContainerFloppy extends Item with UpgradeContainer {
override def providedSlot(stack: ItemStack) = Slot.Disk override def providedSlot(stack: ItemStack) = Slot.Disk
override def providedTier(stack: ItemStack) = -1 // Any override def providedTier(stack: ItemStack) = Int.MaxValue // Any
} }