made names of items more homogenous. no more prefixes, writing tier as postfix where necessary, added tier to name of memory and hard drives

This commit is contained in:
Florian Nücke 2014-01-31 15:51:41 +01:00
parent 6bac89ae2f
commit c96cc4ff0f
5 changed files with 74 additions and 52 deletions

View File

@ -6,9 +6,9 @@
oc:block.Adapter.name=Adapter
oc:block.Cable.name=Kabel
oc:block.Capacitor.name=Kondensator
oc:block.Case0.name=Einfaches Gehäuse
oc:block.Case1.name=Hochwertiges Gehäuse
oc:block.Case2.name=Ausgezeichnetes Gehäuse
oc:block.Case0.name=Computergehäuse (Stufe 1)
oc:block.Case1.name=Computergehäuse (Stufe 2)
oc:block.Case2.name=Computergehäuse (Stufe 3)
oc:block.Charger.name=Ladestation
oc:block.DiskDrive.name=Diskettenlaufwerk
oc:block.Keyboard.name=Tastatur
@ -18,9 +18,9 @@ oc:block.Redstone.name=Redstone-I/O
oc:block.Robot.name=Roboter
oc:block.RobotAfterimage.name=Roboter
oc:block.Router.name=Router
oc:block.Screen0.name=Einfacher Bildschirm
oc:block.Screen1.name=Hochwertiger Bildschirm
oc:block.Screen2.name=Ausgezeichneter Bildschirm
oc:block.Screen0.name=Bildschirm (Stufe 1)
oc:block.Screen1.name=Bildschirm (Stufe 2)
oc:block.Screen2.name=Bildschirm (Stufe 3)
oc:block.ServerRack.name=Serverschrank
# Items
@ -33,22 +33,28 @@ oc:item.ButtonGroup.name=Tastengruppe
oc:item.CardBase.name=Kartenbasis
oc:item.CircuitBoard.name=Leiterplatte
oc:item.ControlUnit.name=Steuerwerk (CU)
oc:item.CPU0.name=Einfacher Hauptprozessor (CPU)
oc:item.CPU1.name=Hochwertiger Hauptprozessor (CPU)
oc:item.CPU2.name=Ausgezeichneter Hauptprozessor (CPU)
oc:item.CPU0.name=Hauptprozessor (CPU) (Stufe 1)
oc:item.CPU1.name=Hauptprozessor (CPU) (Stufe 2)
oc:item.CPU2.name=Hauptprozessor (CPU) (Stufe 3)
oc:item.CuttingWire.name=Schneidedraht
oc:item.Disk.name=Platte
oc:item.FloppyDisk.name=Diskette
oc:item.GraphicsCard0.name=Einfache Grafikkarte
oc:item.GraphicsCard1.name=Hochwertige Grafikkarte
oc:item.GraphicsCard2.name=Ausgezeichnete Grafikkarte
oc:item.HardDiskDrive.name=Festplatte
oc:item.GraphicsCard0.name=Grafikkarte (Stufe 1)
oc:item.GraphicsCard1.name=Grafikkarte (Stufe 2)
oc:item.GraphicsCard2.name=Grafikkarte (Stufe 3)
oc:item.HardDiskDrive0.name=Festplatte (Stufe 1)
oc:item.HardDiskDrive1.name=Festplatte (Stufe 2)
oc:item.HardDiskDrive2.name=Festplatte (Stufe 3)
oc:item.InternetCard.name=Internetkarte
oc:item.IronNugget.name=Eisennugget
oc:item.Memory.name=Speicher
oc:item.Microchip0.name=Einfacher Microchip
oc:item.Microchip1.name=Hochwertiger Microchip
oc:item.Microchip2.name=Ausgezeichneter Microchip
oc:item.Memory0.name=Speicher (Stufe 1)
oc:item.Memory1.name=Speicher (Stufe 2)
oc:item.Memory2.name=Speicher (Stufe 2.5)
oc:item.Memory3.name=Speicher (Stufe 3)
oc:item.Memory4.name=Speicher (Stufe 3.5)
oc:item.Microchip0.name=Microchip (Stufe 1)
oc:item.Microchip1.name=Microchip (Stufe 2)
oc:item.Microchip2.name=Microchip (Stufe 3)
oc:item.NetworkCard.name=Netzwerkkarte
oc:item.NumPad.name=Ziffernblock
oc:item.PrintedCircuitBoard.name=Gedruckte Leiterplatte (PCB)

View File

@ -6,9 +6,9 @@
oc:block.Adapter.name=Adapter
oc:block.Cable.name=Cable
oc:block.Capacitor.name=Capacitor
oc:block.Case0.name=Basic Case
oc:block.Case1.name=Advanced Case
oc:block.Case2.name=Superior Case
oc:block.Case0.name=Computer Case (Tier 1)
oc:block.Case1.name=Computer Case (Tier 2)
oc:block.Case2.name=Computer Case (Tier 3)
oc:block.Charger.name=Charger
oc:block.DiskDrive.name=Disk Drive
oc:block.Keyboard.name=Keyboard
@ -18,9 +18,9 @@ oc:block.Redstone.name=Redstone I/O
oc:block.Robot.name=Robot
oc:block.RobotAfterimage.name=Robot
oc:block.Router.name=Router
oc:block.Screen0.name=Basic Screen
oc:block.Screen1.name=Advanced Screen
oc:block.Screen2.name=Superior Screen
oc:block.Screen0.name=Screen (Tier 1)
oc:block.Screen1.name=Screen (Tier 2)
oc:block.Screen2.name=Screen (Tier 3)
oc:block.ServerRack.name=Server Rack
# Items
@ -33,22 +33,28 @@ oc:item.ButtonGroup.name=Button Group
oc:item.CardBase.name=Card Base
oc:item.CircuitBoard.name=Circuit Board
oc:item.ControlUnit.name=Control Unit (CU)
oc:item.CPU0.name=Basic Central Processing Unit (CPU)
oc:item.CPU1.name=Advanced Central Processing Unit (CPU)
oc:item.CPU2.name=Superior Central Processing Unit (CPU)
oc:item.CPU0.name=Central Processing Unit (CPU) (Tier 1)
oc:item.CPU1.name=Central Processing Unit (CPU) (Tier 2)
oc:item.CPU2.name=Central Processing Unit (CPU) (Tier 3)
oc:item.CuttingWire.name=Cutting Wire
oc:item.Disk.name=Disk Platter
oc:item.FloppyDisk.name=Floppy Disk
oc:item.GraphicsCard0.name=Basic Graphics Card
oc:item.GraphicsCard1.name=Advanced Graphics Card
oc:item.GraphicsCard2.name=Superior Graphics Card
oc:item.HardDiskDrive.name=Hard Disk Drive
oc:item.GraphicsCard0.name=Graphics Card (Tier 1)
oc:item.GraphicsCard1.name=Graphics Card (Tier 2)
oc:item.GraphicsCard2.name=Graphics Card (Tier 3)
oc:item.HardDiskDrive0.name=Hard Disk Drive (Tier 1)
oc:item.HardDiskDrive1.name=Hard Disk Drive (Tier 2)
oc:item.HardDiskDrive2.name=Hard Disk Drive (Tier 3)
oc:item.InternetCard.name=Internet Card
oc:item.IronNugget.name=Iron Nugget
oc:item.Memory.name=Memory
oc:item.Microchip0.name=Simple Microchip
oc:item.Microchip1.name=Advanced Microchip
oc:item.Microchip2.name=Superior Microchip
oc:item.Memory0.name=Memory (Tier 1)
oc:item.Memory1.name=Memory (Tier 2)
oc:item.Memory2.name=Memory (Tier 2.5)
oc:item.Memory3.name=Memory (Tier 3)
oc:item.Memory4.name=Memory (Tier 3.5)
oc:item.Microchip0.name=Microchip (Tier 1)
oc:item.Microchip1.name=Microchip (Tier 2)
oc:item.Microchip2.name=Microchip (Tier 3)
oc:item.NetworkCard.name=Network Card
oc:item.NumPad.name=Numeric Keypad
oc:item.PrintedCircuitBoard.name=Printed Circuit Board (PCB)

View File

@ -2,9 +2,9 @@
oc:block.Adapter.name=Adaptateur
oc:block.Cable.name=Cable
oc:block.Capacitor.name=Capaciteur
oc:block.Case0.name=Boitier
oc:block.Case1.name=Boitier avancé
oc:block.Case2.name=Boitier supérieur
oc:block.Case0.name=Boitier (Niveau 1)
oc:block.Case1.name=Boitier (Niveau 2)
oc:block.Case2.name=Boitier (Niveau 3)
oc:block.Charger.name=Chargeur
oc:block.DiskDrive.name=Lecteur de disquettes
oc:block.Keyboard.name=Clavier
@ -14,9 +14,9 @@ oc:block.Redstone.name=Redstone E/S
oc:block.Robot.name=Robot
oc:block.RobotAfterimage.name=Robot
oc:block.Router.name=Routeur
oc:block.Screen0.name=Ecran
oc:block.Screen1.name=Ecran avancé
oc:block.Screen2.name=Ecran supérieur
oc:block.Screen0.name=Ecran (Niveau 1)
oc:block.Screen1.name=Ecran (Niveau 2)
oc:block.Screen2.name=Ecran (Niveau 3)
# Items
oc:item.Acid.name=Grog
@ -27,19 +27,27 @@ oc:item.ButtonGroup.name=Groupe de boutons
oc:item.CardBase.name=Base de carte
oc:item.CircuitBoard.name=Plaque de circuit imprimé
oc:item.ControlUnit.name=Unité de contrôle
oc:item.CPU.name=Processeur
oc:item.CPU0.name=Processeur (Niveau 1)
oc:item.CPU1.name=Processeur (Niveau 2)
oc:item.CPU2.name=Processeur (Niveau 3)
oc:item.CuttingWire.name=Fil de coupe
oc:item.Disk.name=Disque
oc:item.FloppyDisk.name=Disquette
oc:item.GraphicsCard0.name=Carte graphique
oc:item.GraphicsCard1.name=Carte graphique avancée
oc:item.GraphicsCard2.name=Carte graphique supérieure
oc:item.HardDiskDrive.name=Disque dur
oc:item.GraphicsCard0.name=Carte graphique (Niveau 1)
oc:item.GraphicsCard1.name=Carte graphique (Niveau 2)
oc:item.GraphicsCard2.name=Carte graphique (Niveau 3)
oc:item.HardDiskDrive0.name=Disque dur (Niveau 1)
oc:item.HardDiskDrive1.name=Disque dur (Niveau 2)
oc:item.HardDiskDrive2.name=Disque dur (Niveau 3)
oc:item.IronNugget.name=Pépite de fer
oc:item.Memory.name=Mémoire
oc:item.Microchip0.name=Puce électronique
oc:item.Microchip1.name=Puce électronique avancée
oc:item.Microchip2.name=Puce électronique supérieure
oc:item.Memory0.name=Mémoire (Niveau 1)
oc:item.Memory1.name=Mémoire (Niveau 2)
oc:item.Memory2.name=Mémoire (Niveau 2.5)
oc:item.Memory3.name=Mémoire (Niveau 3)
oc:item.Memory4.name=Mémoire (Niveau 3.5)
oc:item.Microchip0.name=Puce électronique (Niveau 1)
oc:item.Microchip1.name=Puce électronique (Niveau 2)
oc:item.Microchip2.name=Puce électronique (Niveau 3)
oc:item.NetworkCard.name=Carte réseau
oc:item.NumPad.name=Pavé numérique
oc:item.PrintedCircuitBoard.name=Circuit imprimé

View File

@ -8,7 +8,8 @@ import net.minecraft.item.{EnumRarity, ItemStack}
import scala.Array
class HardDiskDrive(val parent: Delegator, val tier: Int) extends Delegate {
val unlocalizedName = "HardDiskDrive"
val baseName = "HardDiskDrive"
val unlocalizedName = baseName + tier
val kiloBytes = Settings.get.hddSizes(tier)

View File

@ -9,7 +9,8 @@ import net.minecraft.item.{EnumRarity, ItemStack}
import scala.Array
class Memory(val parent: Delegator, val tier: Int) extends Delegate {
val unlocalizedName = "Memory"
val baseName = "Memory"
val unlocalizedName = baseName + tier
val kiloBytes = Settings.get.ramSizes(tier)
@ -19,7 +20,7 @@ class Memory(val parent: Delegator, val tier: Int) extends Delegate {
Some(parent.getItemStackDisplayName(stack) + " (%dKB)".format(kiloBytes))
override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) {
tooltip.addAll(Tooltip.get(unlocalizedName))
tooltip.addAll(Tooltip.get(baseName))
super.tooltipLines(stack, player, tooltip, advanced)
}