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

Reworked how complexity is computed when assembling robots. Cases now only provide a base level, CPUs control the max complexity in more detail (and don't contribute to complexity themselves anymore). Closes #522.

Browse Source
This commit is contained in:
Florian Nücke 2014-08-29 18:59:15 +02:00
parent 3d5029caa0
commit 1176e7b3f0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
View File

@ -260,6 +260,7 @@ object RobotTemplate {
for (slot <- 1 until inventory.getSizeInventory) {
val stack = inventory.getStackInSlot(slot)
acc += (Option(api.Driver.driverFor(stack)) match {
case Some(driver: Processor) => 0 // CPUs are exempt, since they control the limit.
case Some(driver: UpgradeContainer) => (1 + driver.tier(stack)) * 2
case Some(driver) => 1 + driver.tier(stack)
case _ => 0
@ -270,6 +271,16 @@ object RobotTemplate {
private def maxComplexity(inventory: IInventory) = {
val caseTier = ItemUtils.caseTier(inventory.getStackInSlot(0))
if (caseTier >= 0) Settings.robotComplexityByTier(caseTier) else 0
val cpuTier = (0 until inventory.getSizeInventory).foldRight(0)((slot, acc) => {
val stack = inventory.getStackInSlot(slot)
acc + (api.Driver.driverFor(stack) match {
case processor: Processor => processor.tier(stack)
case _ => 0
})
})
if (caseTier >= Tier.One && cpuTier >= Tier.One) {
Settings.robotComplexityByTier(caseTier) - (caseTier - cpuTier) * 6
}
else 0
}
}