Voomra/trader
Archived
0
Fork 0
Code Activity

add 2.1 items

Browse Source
This commit is contained in:
Mo
2016-06-04 10:48:10 +03:00
parent 2c84ad29d2
commit 5b0833d8a6
5 changed files with 93 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/ext-resources/all/world.xml
View File

File diff suppressed because one or more lines are too long

46
client/src/main/resources/lang/locale.properties
View File

@@ -104,7 +104,7 @@ item.grain=Grain
item.syntheticmeat=Synthetic Meat
item.tea=Tea
item.group.engineered_ceramics=Industrial Materials
item.cmm_composite=C M M Composite
item.cmm_composite=CMM Composite
item.ceramic_composites=Ceramic Composites
item.insulating_membrane=Insulating Membrane
item.meta_alloys=Meta-Alloys
@@ -119,6 +119,7 @@ item.basicnarcotics=Narcotics
item.tobacco=Tobacco
item.wine=Wine
item.group.machinery=Machinery
item.articulation_motors=Articulation Motors
item.atmosphericprocessors=Atmospheric Processors
item.building_fabricators=Building Fabricators
item.cropharvesters=Crop Harvesters
@@ -126,14 +127,17 @@ item.emergency_power_cells=Emergency Power Cells
item.exhaust_manifold=Exhaust Manifold
item.geological_equipment=Geological Equipment
item.heatsink_interlink=Heatsink Interlink
item.hn_shock_mount=H N Shock Mount
item.hn_shock_mount=HN Shock Mount
item.magnetic_emitter_coil=Magnetic Emitter Coil
item.marinesupplies=Marine Equipment
item.microbialfurnaces=Microbial Furnaces
item.mineralextractors=Mineral Extractors
item.modular_terminals=Modular Terminals
item.power_converter=Power Converter
item.powergenerators=Power Generators
item.power_grid_assembly=Power Grid Assembly
item.power_grid_assembly=Energy Grid Assembly
item.power_transfer_conduits=Power Transfer Conduits
item.radiation_baffle=Radiation Baffle
item.reinforced_mounting_plate=Reinforced Mounting Plate
item.skimer_components=Skimmer Components
item.thermal_cooling_units=Thermal Cooling Units
@@ -180,7 +184,7 @@ item.lepidolite=Lepidolite
item.lithium_hydroxide=Lithium Hydroxide
item.low_temperature_diamond=Low Temperature Diamond
item.methane_clathrate=Methane Clathrate
item.methanol_monohydrate_crystals=Methanol Monohydrate Crystals
item.methanol_monohydrate_crystals=Methanol Monohydrate
item.painite=Painite
item.pyrophyllite=Pyrophyllite
item.rutile=Rutile
@@ -197,15 +201,18 @@ item.aquaponicsystems=Aquaponic Systems
item.autofabricators=Auto-Fabricators
item.bioreducinglichen=Bioreducing Lichen
item.computercomponents=Computer Components
item.diagnostic_sensor=Diagnostic Sensor
item.diagnostic_sensor=Hardware Diagnostic Sensor
item.hazardousenvironmentsuits=H.E. Suits
item.ion_distributor=Ion Distributor
item.landenrichmentsystems=Land Enrichment Systems
item.medical_diagnostic_equipment=Medical Diagnostic Equipment
item.micro_controllers=Micro Controllers
item.mu_tom_imager=Muon Imager
item.nanobreakers=Nanobreakers
item.resonatingseparators=Resonating Separators
item.robotics=Robotics
item.structural_regulators=Structural Regulators
item.telemetry_suite=Telemetry Suite
item.group.textiles=Textiles
item.conductive_fabrics=Conductive Fabrics
item.leather=Leather
@@ -223,3 +230,32 @@ item.nonlethalweapons=Non-Lethal Weapons
item.personalweapons=Personal Weapons
item.reactivearmour=Reactive Armour
item.group.ships=Ships
item.sidewinder=Sidewinder
item.eagle=Eagle
item.hauler=Hauler
item.adder=Adder
item.imperial_eagle=Imperial Eagle
item.viper=Viper
item.cobraMk3=Cobra Mk III
item.viperMkIV=Viper Mk IV
item.diamondback_scout=Diamondback Scout
item.type6=Type-6 Transporter
item.diamondback_explorer=Diamondback Explorer
item.cobraMkIV=Cobra Mk IV
item.imperial_courier=Imperial Courier
item.keelback=Keelback
item.asp_scout=Asp Scout
item.vulture=Vulture
item.asp=Asp Explorer
item.federal_dropship=Federal Dropship
item.type7=Type-7 Transporter
item.federal_assault_ship=Federal Assault Ship
item.imperial_clipper=Imperial Clipper
item.federal_gunship=Federal Gunship
item.orca=Orca
item.fer_de_lance=Fer-de-Lance
item.python=Python
item.type9=Type-9 Heavy
item.anaconda=Anaconda
item.federation_corvette=Federal Corvette
item.cutter=Imperial Cutter

7
client/src/main/resources/lang/locale_ru_RU_FULL.properties
View File

@@ -121,6 +121,7 @@ item.basicnarcotics=\u041D\u0430\u0440\u043A\u043E\u0442\u0438\u043A\u0438
item.tobacco=\u0422\u0430\u0431\u0430\u043A
item.wine=\u0412\u0438\u043D\u043E
item.group.machinery=\u041C\u0430\u0448\u0438\u043D\u043D\u043E\u0435 \u043E\u0431\u043E\u0440\u0443\u0434\u043E\u0432\u0430\u043D\u0438\u0435
item.articulation_motors=\u0428\u0430\u0440\u043D\u0438\u0440\u043D\u044B\u0435 \u043C\u043E\u0442\u043E\u0440\u044B
item.atmosphericprocessors=\u0410\u0442\u043C\u043E\u0441\u0444\u0435\u0440\u043D\u044B\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440
item.building_fabricators=\u0421\u0442\u0440\u043E\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0441\u0438\u043D\u0442\u0435\u0437\u0430\u0442\u043E\u0440\u044B
item.cropharvesters=\u0423\u0431\u043E\u0440\u043E\u0447\u043D\u044B\u0439 \u043A\u043E\u043C\u0431\u0430\u0439\u043D
@@ -133,9 +134,12 @@ item.magnetic_emitter_coil=\u0421\u043F\u0438\u0440\u0430\u043B\u044C \u043C\u04
item.marinesupplies=\u041C\u043E\u0440\u0441\u043A\u043E\u0435 \u043E\u0431\u043E\u0440\u0443\u0434\u043E\u0432\u0430\u043D\u0438\u0435
item.microbialfurnaces=\u041C\u0438\u043A\u0440\u043E\u0431\u043D\u044B\u0435 \u043F\u0435\u0447\u0438
item.mineralextractors=\u042D\u043A\u0441\u0442\u0440\u0430\u043A\u0442\u043E\u0440\u044B \u043C\u0438\u043D\u0435\u0440\u0430\u043B\u043E\u0432
item.modular_terminals=\u041C\u043E\u0434\u0443\u043B\u044C\u043D\u044B\u0435 \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B\u044B
item.power_converter=\u041F\u0440\u0435\u043E\u0431\u0440\u0430\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u044D\u043D\u0435\u0440\u0433\u0438\u0438
item.powergenerators=\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u0433\u0435\u043D\u0435\u0440\u0430\u0442\u043E\u0440\u044B
item.power_grid_assembly=\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u0441\u0435\u0442\u044C \u0432 \u0441\u0431\u043E\u0440\u0435
item.power_transfer_conduits=\u042D\u043D\u0435\u0440\u0433\u043E\u043E\u0431\u043C\u0435\u043D\u043D\u0430\u044F \u0448\u0438\u043D\u0430
item.radiation_baffle=\u041E\u0442\u0440\u0430\u0436\u0430\u0442\u0435\u043B\u044C \u0438\u0437\u043B\u0443\u0447\u0435\u043D\u0438\u044F
item.reinforced_mounting_plate=\u0423\u0441\u0438\u043B\u0435\u043D\u043D\u0430\u044F \u043C\u043E\u043D\u0442\u0430\u0436\u043D\u0430\u044F \u043F\u043B\u0438\u0442\u0430
item.skimer_components=\u0414\u0435\u0442\u0430\u043B\u0438 \u043E\u0431\u043E\u0440\u043E\u043D. \u0431\u0435\u0441\u043F\u0438\u043B\u043E\u0442\u043D\u0438\u043A\u043E\u0432
item.thermal_cooling_units=\u0422\u0435\u0440\u043C\u0430\u043B\u044C\u043D\u044B\u0435 \u043E\u0445\u043B\u0430\u0434\u0438\u0442\u0435\u043B\u0438
@@ -201,13 +205,16 @@ item.bioreducinglichen=\u041B\u0438\u0448\u0430\u0439\u043D\u0438\u043A-\u0431\u
item.computercomponents=\u041A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u043D\u044B\u0435 \u043A\u043E\u043C\u043F\u043E\u043D\u0435\u043D\u0442\u044B
item.diagnostic_sensor=\u0421\u0435\u043D\u0441\u043E\u0440 \u0434\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u043A\u0438 \u043E\u0431\u043E\u0440\u0443\u0434\u043E\u0432\u0430\u043D\u0438\u044F
item.hazardousenvironmentsuits=\u0417\u0430\u0449\u0438\u0442\u043D\u044B\u0435 \u043A\u043E\u0441\u0442\u044E\u043C\u044B
item.ion_distributor=\u0418\u043E\u043D\u043D\u044B\u0439 \u0440\u0430\u0441\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C
item.landenrichmentsystems=\u0421\u0438\u0441\u0442\u0435\u043C\u044B \u043E\u0431\u043E\u0433\u0430\u0449\u0435\u043D\u0438\u044F \u043F\u043E\u0447\u0432\u044B
item.medical_diagnostic_equipment=\u0414\u0438\u0430\u0433\u043D\u043E\u0441\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u043C\u0435\u0434\u0438\u0446\u0438\u043D\u0441\u043A\u043E\u0435 \u043E\u0431\u043E\u0440\u0443\u0434\u043E\u0432\u0430\u043D\u0438\u0435
item.micro_controllers=\u041C\u0438\u043A\u0440\u043E\u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0435\u0440\u044B
item.mu_tom_imager=\u041C\u044E\u043E\u043D\u043D\u043E\u0435 \u0432\u0438\u0434\u0435\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E
item.nanobreakers=\u041D\u0430\u043D\u043E\u043F\u0440\u0435\u0440\u044B\u0432\u0430\u0442\u0435\u043B\u0438
item.resonatingseparators=\u0420\u0435\u0437\u043E\u043D\u0430\u043D\u0441\u043D\u044B\u0435 \u0441\u0435\u043F\u0430\u0440\u0430\u0442\u043E\u0440\u044B
item.robotics=\u0420\u043E\u0431\u043E\u0442\u044B
item.structural_regulators=\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u043E\u043D\u043D\u044B\u0435 \u0440\u0435\u0433\u0443\u043B\u044F\u0442\u043E\u0440\u044B
item.telemetry_suite=\u0422\u0435\u043B\u0435\u043C\u0435\u0442\u0440\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u043A\u043E\u043C\u043F\u043B\u0435\u043A\u0442
item.group.textiles=\u0422\u0435\u043A\u0441\u0442\u0438\u043B\u044C
item.conductive_fabrics=\u041F\u0440\u043E\u0432\u043E\u0434\u044F\u0449\u0430\u044F \u0442\u043A\u0430\u043D\u044C
item.leather=\u041A\u043E\u0436\u0430

8
utils/src/main/java/ru/trader/edce/Converter.java
View File

@@ -145,7 +145,13 @@ public class Converter {
ITEM_ID.put(128673875L, "diagnostic_sensor");
ITEM_ID.put(128682047L, "medical_diagnostic_equipment");
ITEM_ID.put(128673867L, "reinforced_mounting_plate");
ITEM_ID.put(128673859L, "articulation_motors");
ITEM_ID.put(128673870L, "modular_terminals");
ITEM_ID.put(128673864L, "power_transfer_conduits");
ITEM_ID.put(128673865L, "radiation_baffle");
ITEM_ID.put(128673874L, "ion_distributor");
ITEM_ID.put(128673871L, "nanobreakers");
ITEM_ID.put(128673872L, "telemetry_suite");
GROUP_ID.put("Chemicals", "chemicals");
GROUP_ID.put("Consumer Items", "consumer_items");

36
utils/src/main/java/ru/trader/maddavo/ItemConverter.java
View File

@@ -127,6 +127,42 @@ public class ItemConverter {
IDS.put("non-lethal weapons", "nonlethalweapons");
IDS.put("personal weapons", "personalweapons");
IDS.put("reactive armour", "reactivearmour");
IDS.put("Hydrogen Peroxide", "hydrogen_peroxide");
IDS.put("Liquid Oxygen", "liquid_oxygen");
IDS.put("Water", "water");
IDS.put("Survival Equipment", "survival_equipment");
IDS.put("CMM Composite", "cmm_composite");
IDS.put("Insulating Membrane", "insulating_membrane");
IDS.put("Emergency Power Cells", "emergency_power_cells");
IDS.put("Exhaust Manifold", "exhaust_manifold");
IDS.put("HN Shock Mount", "hn_shock_mount");
IDS.put("Advanced Medicines", "advanced_medicines");
IDS.put("Praseodymium", "praseodymium");
IDS.put("Samarium", "samarium");
IDS.put("Low Temperature Diamond", "low_temperature_diamond");
IDS.put("Micro Controllers", "micro_controllers");
IDS.put("Conductive Fabrics", "conductive_fabrics");
IDS.put("Lithium Hydroxide", "lithium_hydroxide");
IDS.put("Methane Clathrate", "methane_clathrate");
IDS.put("Military Grade Fabrics", "military_grade_fabrics");
IDS.put("Heatsink Interlink", "heatsink_interlink");
IDS.put("Magnetic Emitter Coil", "magnetic_emitter_coil");
IDS.put("Power Converter", "power_converter");
IDS.put("Energy Grid Assembly", "power_grid_assembly");
IDS.put("Bromellite", "bromellite");
IDS.put("Methanol Monohydrate", "methanol_monohydrate_crystals");
IDS.put("Hardware Diagnostic Sensor", "diagnostic_sensor");
IDS.put("Medical Diagnostic Equipment", "medical_diagnostic_equipment");
IDS.put("Reinforced Mounting Plate", "reinforced_mounting_plate");
IDS.put("Articulation Motors", "articulation_motors");
IDS.put("Modular Terminals", "modular_terminals");
IDS.put("Power Transfer Conduits", "power_transfer_conduits");
IDS.put("Radiation Baffle", "radiation_baffle");
IDS.put("Ion Distributor", "ion_distributor");
IDS.put("Nanobreakers", "nanobreakers");
IDS.put("Telemetry Suite", "telemetry_suite");
}
public static String getItemId(String name){