diff --git a/res/bundles/bundle.properties b/res/bundles/bundle.properties index 9be43012..2f41a826 100644 --- a/res/bundles/bundle.properties +++ b/res/bundles/bundle.properties @@ -87,13 +87,13 @@ setting.fos-unlock-all-content = Unlock all content. block.fos-resource-extractor.name = Resource Extractor block.fos-resource-extractor.description = Refines inputted materials into their metal components. Output can be selected. block.fos-cuberium-synthesizer.name = Cuberium Synthesizer -block.fos-cuberium-synthesizer.description = Fuses titanium, tin, silver and oxygen into cuberium. +block.fos-cuberium-synthesizer.description = Fuses titanium, zinc, silver and oxygen into cuberium. block.fos-sublimator.name = Sublimator block.fos-sublimator.description = When placed on ice, converts it into hydrogen and oxygen gas indefinitely. Requires power. block.fos-silicon-synthesizer.name = Silicon Synthesizer block.fos-silicon-synthesizer.description = Synthesizes silicon from diamonds and sand. block.fos-brass-smelter.name = Brass Smelter -block.fos-brass-smelter.description = Produces brass from copper, tin and different metals extracted from tokicite. +block.fos-brass-smelter.description = Produces brass from copper, zinc and different metals extracted from tokicite. block.fos-arkycite-refinery.name = Arkycite Refinery block.fos-arkycite-refinery.description = Refines raw arkycite, extracting sulphur, oil and water. block.fos-crude-drill.name = Crude Drill @@ -105,9 +105,9 @@ block.fos-proficient-drill.description = When placed on ore, outputs items indef block.fos-rock-crusher.name = Rock Crusher block.fos-rock-crusher.description = A simple but fragile drill that also produces heat when working. Overheat will result in destruction. block.fos-rock-crusher.details = A drill made of rocks that mines rocks. Ironic, isn't it? -block.fos-tin-drill.name = Tin Drill -block.fos-tin-drill.description = When placed in underground ore's location, outputs items indefinitely. You must scan the land first before placing. -block.fos-tin-drill.details = If there are no ores under the drill, it will output sand instead. +block.fos-zinc-drill.name = Zinc Drill +block.fos-zinc-drill.description = When placed in underground ore's location, outputs items indefinitely. You must scan the land first before placing. +block.fos-zinc-drill.details = If there are no ores under the drill, it will output sand instead. block.fos-silver-drill.name = Silver Drill block.fos-silver-drill.description = When placed in underground ore's location, outputs items indefinitely. Mines at a slightly faster pace. block.fos-diamond-drill.name = Diamond Drill @@ -130,20 +130,20 @@ block.fos-space-bridge.name = Space Bridge block.fos-space-bridge.description = A duct bridge that was designed for space environments. block.fos-item-catapult.name = Item Catapult block.fos-item-catapult.description = Slowly launches items to another catapult through space. Intended for transportation between asteroids. -block.fos-tin-router.name = Tin Router -block.fos-tin-router.description = Distributes input items to 3 output directions equally. -block.fos-tin-distributor.name = Tin Distributor -block.fos-tin-distributor.description = Distributes input items to 7 output directions equally. -block.fos-tin-junction.name = Tin Junction -block.fos-tin-junction.description = Acts as a bridge for two crossing conveyor belts. -block.fos-tin-sorter.name = Tin Sorter -block.fos-tin-sorter.description = If an input item matches the selection, it moves forward. Otherwise, the item is inputted to the sides. +block.fos-zinc-router.name = Zinc Router +block.fos-zinc-router.description = Distributes input items to 3 output directions equally. +block.fos-zinc-distributor.name = Zinc Distributor +block.fos-zinc-distributor.description = Distributes input items to 7 output directions equally. +block.fos-zinc-junction.name = Zinc Junction +block.fos-zinc-junction.description = Acts as a bridge for two crossing conveyor belts. +block.fos-zinc-sorter.name = Zinc Sorter +block.fos-zinc-sorter.description = If an input item matches the selection, it moves forward. Otherwise, the item is inputted to the sides. block.fos-flow-gate.name = Flow Gate block.fos-flow-gate.description = Has 2 toggleable modes.\nNormal Mode: Outputs items to the sides only if the front path is blocked.\nInverse Mode: Outputs items to the front only if the side paths are blocked. -block.fos-tin-bridge.name = Tin Bridge Conveyor -block.fos-tin-bridge.description = Transports items over terrain or buildings. -block.fos-tin-belt.name = Tin Belt -block.fos-tin-belt.description = Transports items forward. +block.fos-zinc-bridge.name = Zinc Bridge Conveyor +block.fos-zinc-bridge.description = Transports items over terrain or buildings. +block.fos-zinc-belt.name = Zinc Belt +block.fos-zinc-belt.description = Transports items forward. block.fos-copper-pipe.name = Copper Pipe block.fos-copper-pipe.description = Moves liquids and gasses forward. block.fos-brass-pipe.name = Brass Pipe @@ -160,15 +160,15 @@ block.fos-fluid-barrel.name = Fluid Barrel block.fos-fluid-barrel.description = Stores a sizeable amount of fluid. Outputs to all sides, similarly to a fluid router. block.fos-fluid-tank.name = Fluid Tank block.fos-fluid-tank.description = Stores a large amount of fluid. Outputs to all sides, similarly to a fluid router. -block.fos-tin-wire.name = Tin Wire -block.fos-tin-wire.description = Connects power blocks and distributes power between them. -block.fos-tin-wire.details = Not ideal for long-range connections because of high resistance. Consider upgrading to better wires when possible. +block.fos-zinc-wire.name = Zinc Wire +block.fos-zinc-wire.description = Connects power blocks and distributes power between them. +block.fos-zinc-wire.details = Not ideal for long-range connections because of high resistance. Consider upgrading to better wires when possible. block.fos-copper-wire.name = Copper Wire block.fos-copper-wire.description = Connects power blocks and distributes power between them. block.fos-brass-wire.name = Brass Wire block.fos-brass-wire.description = Connects power blocks and distributes power between them. -block.fos-tin-wire-pole.name = Tin Wire Pole -block.fos-tin-wire-pole.description = Distributes power over terrain or buildings. +block.fos-zinc-wire-pole.name = Zinc Wire Pole +block.fos-zinc-wire-pole.description = Distributes power over terrain or buildings. block.fos-copper-wire-pole.name = Copper Wire Pole block.fos-copper-wire-pole.description = Distributes power over terrain or buildings. Has longer distance and less resistance than the previous tier. block.fos-brass-wire-pole.name = Brass Wire Pole @@ -188,10 +188,10 @@ block.fos-copper-battery.name = Copper Battery block.fos-copper-battery.description = Stores power in times of surplus energy. Outputs power in times of deficit. block.fos-brass-battery.name = Brass Battery block.fos-brass-battery.description = Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a copper battery. -block.fos-tin-wall.name = Tin Wall -block.fos-tin-wall.description = Protects structures from enemy projectiles. -block.fos-tin-wall-large.name = Large Tin Wall -block.fos-tin-wall-large.description = Protects structures from enemy projectiles. +block.fos-zinc-wall.name = Zinc Wall +block.fos-zinc-wall.description = Protects structures from enemy projectiles. +block.fos-zinc-wall-large.name = Large Zinc Wall +block.fos-zinc-wall-large.description = Protects structures from enemy projectiles. block.fos-diamond-wall.name = Diamond Wall block.fos-diamond-wall.description = Protects structures from enemy projectiles. block.fos-diamond-wall-large.name = Large Diamond Wall @@ -249,7 +249,7 @@ block.fos-purpur.name = Purpur block.fos-purpur-wall.name = Purpur Wall block.fos-tokicite-floor.name = Tokicite block.fos-alien-moss.name = Alien Moss -block.fos-ore-tin.name = Tin Ore +block.fos-ore-zinc.name = Zinc Ore block.fos-ore-silver.name = Silver Ore block.fos-ore-vanadium.name = Vanadium Ore block.fos-ore-lithium.name = Lithium Ore @@ -265,7 +265,7 @@ block.fos-eliminator-factory.description = Produces units designed for attacking block.fos-injector-factory.name = Injector Factory block.fos-injector-factory.description = Produces units designed for turning enemy units to their side. Output units can be used directly, or moved into reconstructors for upgrading. block.fos-draug-factory.name = Draug Miner Drone Factory -block.fos-draug-factory.description = Produces tin-mining drones. +block.fos-draug-factory.description = Produces zinc-mining drones. block.fos-core-colony.name = Core: Colony block.fos-core-colony.description = A small core module that allows for remote core item load and unload. Does not contribute to core storage or unit cap.\nCan be placed anywhere but not closer than 50 tiles from another Core: Colony. Can't be upgraded. block.fos-core-fortress.name = Core: Fortress @@ -292,13 +292,13 @@ block.fos-mech-research-core.description = Scraps derelict blocks and units and item.fos-raw-nethratium.name = Raw Nethratium item.fos-raw-nethratium.description = Contains aluminium. Used in most structures on Uxerd. item.fos-raw-elbium.name = Raw Elbium -item.fos-raw-elbium.description = Contains tin and lithium. +item.fos-raw-elbium.description = Contains zinc and lithium. item.fos-raw-elithite.name = Raw Elithite item.fos-raw-elithite.description = Contains silver and titanium. Used in electronics. item.fos-aluminium.name = Aluminium item.fos-aluminium.description = A refined metal suitable for construction. -item.fos-tin.name = Tin -item.fos-tin.description = Used in many types of construction and ammunition. +item.fos-zinc.name = Zinc +item.fos-zinc.description = Used in many types of construction and ammunition. item.fos-silver.name = Silver item.fos-lithium.name = Lithium item.fos-brass.name = Brass @@ -330,8 +330,8 @@ sector.fos-intruders.name = The Intruders sector.fos-intruders.description = Vanadium is present in this sector. But beware, an aggressive rogue AI called Sharded also launches its attacks here.\n\nSurvive. Mine vanadium. Research more advanced technologies. sector.fos-citadel.name = Citadel sector.fos-citadel.description = This ruined fortress holds a technology for mountable shotguns. -sector.fos-tin-mining-site.name = Tin Mining Site -sector.fos-tin-mining-site.description = Sharded have set up a tin mining site here. However, there is not much tin here in the first place...\n\nDestroy this base and discover a technology for efficient tin mining. +sector.fos-zinc-mining-site.name = Zinc Mining Site +sector.fos-zinc-mining-site.description = Sharded have set up a zinc mining site here. However, there is not much zinc here in the first place...\n\nDestroy this base and discover a technology for efficient zinc mining. sector.fos-conflict.name = Conflict sector.fos-conflict.description = A small Sharded outpost is found here.\n\nInsect nests are also present as well. Because of this, both you and Sharded will be threatened by them.\n\nYou may choose to attack Sharded after their defenses have been weakened by the insects. @@ -402,7 +402,7 @@ unit.fos-brunt.description = ??? unit.fos-vulture.name = Vulture unit.fos-vulture.description = ??? unit.fos-draug.name = Draug -unit.fos-draug.description = A vintage technology repurposed for Lumoni. Mines tin and delivers it to the core. +unit.fos-draug.description = A vintage technology repurposed for Lumoni. Mines zinc and delivers it to the core. planet.fos-caldemolt.name = Caldemolt planet.fos-uxerd.name = Uxerd @@ -444,16 +444,16 @@ splashnewyear = Happy New Year! #MAP OBJECTIVES cl.makingunit = Constructing a "Lord" battle drone... -cl.minetin = Metal detected: Tin.\nDescription: Used for construction.\nMine this metal for further research. -cl.researchautomation = Using tin structures, you can automate mining.\nResearch the tin conveyor belt and the Crude Drill to continue. -cl.placedrills = Now you can automate tin mining.\nPlace at least 6 drills on tin ore.\nFurther search for ore patches may be required. -cl.moretin = Tin will be useful later, so hoarding it is a good idea. -cl.researchdeepdrills = The core has detected an ore underground: Silver.\nResearch the Tin Drill to start mining. +cl.minetin = Metal detected: Zinc.\nDescription: Used for construction.\nMine this metal for further research. +cl.researchautomation = Using zinc structures, you can automate mining.\nResearch the zinc conveyor belt and the Crude Drill to continue. +cl.placedrills = Now you can automate zinc mining.\nPlace at least 6 drills on zinc ore.\nFurther search for ore patches may be required. +cl.moretin = Zinc will be useful later, so hoarding it is a good idea. +cl.researchdeepdrills = The core has detected an ore underground: Silver.\nResearch the Zinc Drill to start mining. cl.minesilver = Begin mining silver. cl.defendfrombugs = [red]Warning![] Aggressive local fauna detected, capable of demolishing structures.\nStrengthen your buildings using walls and use the battle drone's rifle to destroy the insects. cl.researchupgradecenter = More insects will be coming soon. Research and place the Upgrade Center to enhance your battle drone's rifle. cl.researchwindturbine = Upgrade Center requires power to function. Windy weather in this planet allows to freely obtain power using Wind Turbines.\nResearch them to continue. -cl.researchwires = Now research Tin Wires to connect the turbines to any power-consuming block, including the Upgrade Center. +cl.researchwires = Now research Zinc Wires to connect the turbines to any power-consuming block, including the Upgrade Center. cl.placeturbines = Place Wind Turbines, then connect them all to the Upgrade Center using wires. cl.researchoredetectors = Weapons made in the Upgrade Center require materials to be constructed.\nYou can find even more ores underground outside the core's scanning zone.\nResearch Ore Detectors and begin scanning the territory. cl.bugsapproaching = The insects are approaching in a few minutes. diff --git a/res/bundles/bundle_ru.properties b/res/bundles/bundle_ru.properties index a33bea4f..e3f0fec3 100644 --- a/res/bundles/bundle_ru.properties +++ b/res/bundles/bundle_ru.properties @@ -81,7 +81,7 @@ setting.fos-ostdontshowagain.name = Не показывать сообщение setting.fos-ostdontshowagain.description = Отключить напоминание загрузить FOS OST при запуске игры. setting.fos-refreshsplash.name = Обновить подзаголовок мода setting.fos-debugmode.name = [red]Опасная зона: []Режим отладки -setting.fos-debugmode.description = Включает функции отладки. Не рекомендуется для игроков.\nПерезагрузите игру, чтобы изменения вступили в силу.\n[red]Требует перепуска игры +setting.fos-debugmode.description = Включает функции отладки. Не рекомендуется для игроков.\nПерезагрузите игру, чтобы изменения вступили в силу.\nПерезагрузите игру, чтобы изменения вступили в силу. setting.fos-unlock-all-content = Разблокировать весь контент. block.fos-resource-extractor.name = Экстрактор ресурсов @@ -93,7 +93,7 @@ block.fos-sublimator.description = Сублимирует лед и произв block.fos-silicon-synthesizer.name = Кремниевый синтезатор block.fos-silicon-synthesizer.description = Синтезирует кремний из алмазов и песка. block.fos-brass-smelter.name = Латунная плавильня -block.fos-brass-smelter.description = Производит латунь из меди, олова и различных металлов, получаемых из токицита. +block.fos-brass-smelter.description = Производит латунь из меди, цинка и различных металлов, получаемых из токицита. block.fos-arkycite-refinery.name = Завод переработки аркицита block.fos-arkycite-refinery.description = Перерабатывает аркицит, извлекая из него серу, нефть и воду. block.fos-crude-drill.name = Грубый бур @@ -105,9 +105,9 @@ block.fos-proficient-drill.description = При размещении на соо block.fos-rock-crusher.name = Дробильщик камня block.fos-rock-crusher.description = Простой, но хрупкий бур, который вдобавок генерирует тепло. Перегрев приведет к уничтожению. block.fos-rock-crusher.details = Бур, добывающий камни и сделанный из камней. Иронично, не так ли? -block.fos-tin-drill.name = Оловянный бур -block.fos-tin-drill.description = При размещении на месте соответствующей подземной руды, постоянно выводит предметы. Перед расстановкой территория должна быть просканирована. -block.fos-tin-drill.details = Если под буром руды не окажется, он будет добывать песок. +block.fos-zinc-drill.name = Цинковый бур +block.fos-zinc-drill.description = При размещении на месте соответствующей подземной руды, постоянно выводит предметы. Перед расстановкой территория должна быть просканирована. +block.fos-zinc-drill.details = Если под буром руды не окажется, он будет добывать песок. block.fos-silver-drill.name = Серебряный бур block.fos-silver-drill.description = При размещении на месте соответствующей подземной руды, постоянно выводит предметы. Добывает ресурсы немного быстрее. block.fos-diamond-drill.name = Алмазный бур @@ -130,20 +130,20 @@ block.fos-space-bridge.name = Космический мост block.fos-space-bridge.description = Мостовая труба, пригодная для космоса. block.fos-item-catapult.name = Предметная катапульта block.fos-item-catapult.description = Медленно запускает предметы в другую катапульту через космос. Предназначена для перевозки между астероидами. -block.fos-tin-router.name = Оловянный маршрутизатор -block.fos-tin-router.description = Равномерно распределяет входящие предметы по 3 выходящим направлениям. -block.fos-tin-distributor.name = Оловянный распределитель -block.fos-tin-distributor.description = Равномерно распределяет входящие предметы по 7 выходящим направлениям. -block.fos-tin-junction.name = Оловянный перекресток -block.fos-tin-junction.description = Действует как мост для двух пересекающихся конвейерных лент. -block.fos-tin-sorter.name = Оловянный сортировщик -block.fos-tin-sorter.description = Если входящий предмет совпадает с выбором, то он проходит вперед. Если нет, то предмет выводится в стороны. +block.fos-zinc-router.name = Цинковый маршрутизатор +block.fos-zinc-router.description = Равномерно распределяет входящие предметы по 3 выходящим направлениям. +block.fos-zinc-distributor.name = Цинковый распределитель +block.fos-zinc-distributor.description = Равномерно распределяет входящие предметы по 7 выходящим направлениям. +block.fos-zinc-junction.name = Цинковый перекресток +block.fos-zinc-junction.description = Действует как мост для двух пересекающихся конвейерных лент. +block.fos-zinc-sorter.name = Цинковый сортировщик +block.fos-zinc-sorter.description = Если входящий предмет совпадает с выбором, то он проходит вперед. Если нет, то предмет выводится в стороны. block.fos-flow-gate.name = Избыточный вентиль block.fos-flow-gate.description = Имеет 2 переключаемых режима работы.\nОбычный режим: Выводит предметы по бокам, только если передний путь заблокирован.\nОбратный режим: Выводит предметы вперед, только если боковые пути заблокированы. -block.fos-tin-bridge.name = Оловянный мостовой конвейер -block.fos-tin-bridge.description = Перемещает предметы над местностью или зданиями. -block.fos-tin-belt.name = Оловянная лента -block.fos-tin-belt.description = Перемещает предметы вперед. +block.fos-zinc-bridge.name = Цинковый мостовой конвейер +block.fos-zinc-bridge.description = Перемещает предметы над местностью или зданиями. +block.fos-zinc-belt.name = Цинковая лента +block.fos-zinc-belt.description = Перемещает предметы вперед. block.fos-copper-pipe.name = Медная труба block.fos-copper-pipe.description = Переносит жидкости и газы вперед. block.fos-brass-pipe.name = Латунная труба @@ -160,15 +160,15 @@ block.fos-fluid-barrel.name = Жидкостная бочка block.fos-fluid-barrel.description = Хранит небольшое количество жидкости. Выводит во все стороны, подобно жидкостному маршрутизатору. block.fos-fluid-tank.name = Жидкостный бак block.fos-fluid-tank.description = Хранит большое количество жидкости. Выводит во все стороны, подобно жидкостному маршрутизатору. -block.fos-tin-wire.name = Оловянный провод -block.fos-tin-wire.description = Соединяет энергетические структуры и передает энергию между ними. Не подходит для соединения на дальних расстояниях. -block.fos-tin-wire.details = Не подходит для соединения на дальних расстояниях из-за высокого сопротивления. Постройте провода получше, когда возможно. +block.fos-zinc-wire.name = Цинковый провод +block.fos-zinc-wire.description = Соединяет энергетические структуры и передает энергию между ними. Не подходит для соединения на дальних расстояниях. +block.fos-zinc-wire.details = Не подходит для соединения на дальних расстояниях из-за высокого сопротивления. Постройте провода получше, когда возможно. block.fos-copper-wire.name = Медный провод block.fos-copper-wire.description = Соединяет энергетические структуры и передает энергию между ними. block.fos-brass-wire.name = Латунный провод block.fos-brass-wire.description = Соединяет энергетические структуры и передает энергию между ними. -block.fos-tin-wire-pole.name = Оловянное энергополе -block.fos-tin-wire-pole.description = Передает энергию над местностью или зданиями. +block.fos-zinc-wire-pole.name = Цинковое энергополе +block.fos-zinc-wire-pole.description = Передает энергию над местностью или зданиями. block.fos-copper-wire-pole.name = Медное энергополе block.fos-copper-wire-pole.description = Передает энергию над местностью или зданиями. Имеет большую дальность и меньшее сопротивление, чем предыдущая итерация. block.fos-brass-wire-pole.name = Латунное энергополе @@ -188,10 +188,10 @@ block.fos-copper-battery.name = Медный аккумулятор block.fos-copper-battery.description = Накапливает энергию во времена ее избытка. Выводит энергию во времена дефицита. block.fos-brass-battery.name = Латунный аккумулятор block.fos-brass-battery.description = Накапливает энергию во времена ее избытка. Выводит энергию во времена дефицита. Хранит больше энергии, чем медный аккумулятор. -block.fos-tin-wall.name = Оловянная стена -block.fos-tin-wall.description = Защищает постройки от вражеских снарядов. -block.fos-tin-wall-large.name = Большая оловянная стена -block.fos-tin-wall-large.description = Защищает постройки от вражеских снарядов. +block.fos-zinc-wall.name = Цинковая стена +block.fos-zinc-wall.description = Защищает постройки от вражеских снарядов. +block.fos-zinc-wall-large.name = Большая цинковая стена +block.fos-zinc-wall-large.description = Защищает постройки от вражеских снарядов. block.fos-diamond-wall.name = Алмазная стена block.fos-diamond-wall.description = Защищает постройки от вражеских снарядов. block.fos-diamond-wall-large.name = Большая алмазная стена @@ -249,7 +249,7 @@ block.fos-purpur.name = Пурпур block.fos-purpur-wall.name = Пурпуровая стена block.fos-tokicite-floor.name = Токицит block.fos-alien-moss.name = Инопланетный мох -block.fos-ore-tin.name = Оловянная руда +block.fos-ore-zinc.name = Цинковая руда block.fos-ore-silver.name = Серебряная руда block.fos-ore-vanadium.name = Ванадиевая руда block.fos-ore-lithium.name = Литиевая руда @@ -265,7 +265,7 @@ block.fos-eliminator-factory.description = Производит боевые е block.fos-injector-factory.name = Фабрика инжекторов block.fos-injector-factory.description = Производит боевые единицы, специализированные на обращении вражеских единиц в свою сторону. Вывод может быть осуществлен напрямую, либо перенаправлен в реконструкторы для улучшения. block.fos-draug-factory.name = Завод добывающих дронов "Драугр" -block.fos-draug-factory.description = Производит дроны, добывающие олово. +block.fos-draug-factory.description = Производит дроны, добывающие цинк. block.fos-core-colony.name = Ядро: "Колония" block.fos-core-colony.description = Малый модуль ядра, позволяющий удаленно загружать и разгружать предметы из ядра. Не увеличивает вместимость ядра или лимит боевых единиц.\nМожно ставить где угодно, но не ближе, чем 50 блоков от другого Ядра "Колония". Нельзя улучшить. block.fos-core-fortress.name = Ядро: "Крепость" @@ -292,13 +292,13 @@ block.fos-mech-research-core.description = Превращает разрушен item.fos-raw-nethratium.name = Сырой нетратий item.fos-raw-nethratium.description = Содержит большое количество алюминия. item.fos-raw-elbium.name = Сырой элбий -item.fos-raw-elbium.description = Содержит олово и литий. +item.fos-raw-elbium.description = Содержит цинк и литий. item.fos-raw-elithite.name = Сырой элитит item.fos-raw-elithite.description = Содержит серебро и титан. Используется в электронике. item.fos-aluminium.name = Алюминий item.fos-aluminium.description = Переработанный металл, подходящий для строительства. -item.fos-tin.name = Олово -item.fos-tin.description = Используется в строительстве и амуниции. +item.fos-zinc.name = Цинк +item.fos-zinc.description = Используется в строительстве и амуниции. item.fos-silver.name = Серебро item.fos-lithium.name = Литий item.fos-brass.name = Латунь @@ -330,8 +330,8 @@ sector.fos-intruders.name = Захватчики sector.fos-intruders.description = В этом секторе присутствует ванадий. Но будьте начеку, враждебный восставший ИИ под названием "Расколотые" время от времени атакует эту территорию.\n\nВыживите. Добудьте ванадий. Исследуйте более продвинутые технологии. sector.fos-citadel.name = Цитадель sector.fos-citadel.description = Эта разрушенная крепость хранит в себе технологию для переносных дробовиков. -sector.fos-tin-mining-site.name = Оловянный рудник -sector.fos-tin-mining-site.description = Расколотые устроили здесь базу по добыче олова. Однако, здесь не находится так много олова...\n\nУничтожьте эту базу и раскройте технологию эффективной добычи олова. +sector.fos-zinc-mining-site.name = Цинковый рудник +sector.fos-zinc-mining-site.description = Расколотые устроили здесь базу по добыче цинка. Однако, здесь его находится не так много...\n\nУничтожьте эту базу и раскройте технологию эффективной добычи цинка. sector.fos-conflict.name = Конфликт sector.fos-conflict.description = Здесь был найден небольшой аванпост Расколотых.\n\nГнезда насекомых также присутствуют, поэтому и Вы, и Расколотые будут находиться под угрозой.\n\nВы можете напасть на Расколотых после того, как их оборона будет ослаблена насекомыми. @@ -402,7 +402,7 @@ unit.fos-brunt.description = ??? unit.fos-vulture.name = Стервятник unit.fos-vulture.description = ??? unit.fos-draug.name = Драугр -unit.fos-draug.description = Старинная технология, нашедшая свое место на Люмони. Добывает олово и доставляет его в ядро. +unit.fos-draug.description = Старинная технология, нашедшая свое место на Люмони. Добывает цинк и доставляет его в ядро. planet.fos-caldemolt.name = Калдемолт planet.fos-uxerd.name = Уксерд @@ -444,16 +444,16 @@ splashnewyear = С Новым Годом! #MAP OBJECTIVES cl.makingunit = Строится боевой дрон "Лорд"... -cl.minetin = Обнаружен металл: Олово.\nОписание: Пригоден для строительства.\nДобудьте данный металл для дальнейшего исследования. -cl.researchautomation = С помощью оловянных построек возможно автоматизировать добычу ресурсов.\nИсследуйте оловянную конвейерную ленту и грубый бур, чтобы продолжить. -cl.placedrills = Теперь есть возможность автоматизировать добычу олова.\nУстановите как минимум 6 буровых установок на оловянную руду.\nМожет потребоваться поиск других залеж олова. -cl.moretin = Олово пригодится в дальнейшем, поэтому нужно продолжать накапливать запасы этого металла. -cl.researchdeepdrills = Ядро обнаружило глубинную руду: Серебро.\nИсследуйте оловянный бур, чтобы начать добычу. +cl.minetin = Обнаружен металл: цинк.\nОписание: Пригоден для строительства.\nДобудьте данный металл для дальнейшего исследования. +cl.researchautomation = С помощью цинковых построек возможно автоматизировать добычу ресурсов.\nИсследуйте цинковую конвейерную ленту и грубый бур, чтобы продолжить. +cl.placedrills = Теперь есть возможность автоматизировать добычу цинка.\nУстановите как минимум 6 буровых установок на цинковую руду.\nМожет потребоваться поиск других залежей. +cl.moretin = Цинк пригодится в дальнейшем, поэтому нужно продолжать накапливать запасы этого металла. +cl.researchdeepdrills = Ядро обнаружило глубинную руду: серебро.\nИсследуйте цинковый бур, чтобы начать добычу. cl.minesilver = Начните добычу серебра. cl.defendfrombugs = [red]Внимание![] Обнаружена агрессивная местная фауна, способная уничтожить постройки.\nУкрепите свои структуры с помощью стен и используйте винтовку боевого дрона, чтобы уничтожить насекомых. cl.researchupgradecenter = Скоро прибудет еще больше насекомых. Исследуйте и поставьте Центр улучшения, чтобы улучшить оружие боевого дрона. cl.researchwindturbine = Центру улучшения необходима энергия для работы. Ветряная погода в этой планете позволяет свободно производить энергию с помощью ветряных турбин.\nИсследуйте их, чтобы продолжить. -cl.researchwires = Теперь исследуйте оловянные провода для подключения турбин к любому энергоблоку, включая Центр улучшения. +cl.researchwires = Теперь исследуйте цинковые провода для подключения турбин к любому энергоблоку, включая Центр улучшения. cl.placeturbines = Поставьте ветряные турбины, затем подключите их к Центру улучшения с помощью проводов. cl.researchoredetectors = Оружие, изготовляемое в Центре улучшения, требует сырье.\nВне зоны сканирования ядра можно найти еще больше руды под землей.\nИсследуйте Детекторы руды и начните сканировать территорию. cl.bugsapproaching = Насекомые прибудут через несколько минут. diff --git a/res/maps/tin-mining-site.msav b/res/maps/zinc-mining-site.msav similarity index 100% rename from res/maps/tin-mining-site.msav rename to res/maps/zinc-mining-site.msav diff --git a/res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png b/res/sprites/blocks/distribution/zinc-belt/conveyor-zinc-belt.png similarity index 100% rename from res/sprites/blocks/distribution/tin-belt/conveyor-tin-belt.png rename to res/sprites/blocks/distribution/zinc-belt/conveyor-zinc-belt.png diff --git a/res/sprites/blocks/distribution/tin-belt/tin-belt-full.png b/res/sprites/blocks/distribution/zinc-belt/zinc-belt-full.png similarity index 100% rename from res/sprites/blocks/distribution/tin-belt/tin-belt-full.png rename to res/sprites/blocks/distribution/zinc-belt/zinc-belt-full.png diff --git a/res/sprites/blocks/distribution/tin-belt/tin-belt-ui.png b/res/sprites/blocks/distribution/zinc-belt/zinc-belt-ui.png similarity index 100% rename from res/sprites/blocks/distribution/tin-belt/tin-belt-ui.png rename to res/sprites/blocks/distribution/zinc-belt/zinc-belt-ui.png diff --git a/res/sprites/blocks/distribution/tin-bridge-arrow.png b/res/sprites/blocks/distribution/zinc-bridge-arrow.png similarity index 100% rename from res/sprites/blocks/distribution/tin-bridge-arrow.png rename to res/sprites/blocks/distribution/zinc-bridge-arrow.png diff --git a/res/sprites/blocks/distribution/tin-bridge-bridge.png b/res/sprites/blocks/distribution/zinc-bridge-bridge.png similarity index 100% rename from res/sprites/blocks/distribution/tin-bridge-bridge.png rename to res/sprites/blocks/distribution/zinc-bridge-bridge.png diff --git a/res/sprites/blocks/distribution/tin-bridge-end.png b/res/sprites/blocks/distribution/zinc-bridge-end.png similarity index 100% rename from res/sprites/blocks/distribution/tin-bridge-end.png rename to res/sprites/blocks/distribution/zinc-bridge-end.png diff --git a/res/sprites/blocks/distribution/tin-bridge.png b/res/sprites/blocks/distribution/zinc-bridge.png similarity index 100% rename from res/sprites/blocks/distribution/tin-bridge.png rename to res/sprites/blocks/distribution/zinc-bridge.png diff --git a/res/sprites/blocks/distribution/tin-distributor.png b/res/sprites/blocks/distribution/zinc-distributor.png similarity index 100% rename from res/sprites/blocks/distribution/tin-distributor.png rename to res/sprites/blocks/distribution/zinc-distributor.png diff --git a/res/sprites/blocks/distribution/tin-junction.png b/res/sprites/blocks/distribution/zinc-junction.png similarity index 100% rename from res/sprites/blocks/distribution/tin-junction.png rename to res/sprites/blocks/distribution/zinc-junction.png diff --git a/res/sprites/blocks/distribution/tin-router.png b/res/sprites/blocks/distribution/zinc-router.png similarity index 100% rename from res/sprites/blocks/distribution/tin-router.png rename to res/sprites/blocks/distribution/zinc-router.png diff --git a/res/sprites/blocks/distribution/tin-sorter-cross.png b/res/sprites/blocks/distribution/zinc-sorter-cross.png similarity index 100% rename from res/sprites/blocks/distribution/tin-sorter-cross.png rename to res/sprites/blocks/distribution/zinc-sorter-cross.png diff --git a/res/sprites/blocks/distribution/tin-sorter.png b/res/sprites/blocks/distribution/zinc-sorter.png similarity index 100% rename from res/sprites/blocks/distribution/tin-sorter.png rename to res/sprites/blocks/distribution/zinc-sorter.png diff --git a/res/sprites/blocks/environment/ore-tin-deep1.png b/res/sprites/blocks/environment/ore-zinc-deep1.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-deep1.png rename to res/sprites/blocks/environment/ore-zinc-deep1.png diff --git a/res/sprites/blocks/environment/ore-tin-deep2.png b/res/sprites/blocks/environment/ore-zinc-deep2.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-deep2.png rename to res/sprites/blocks/environment/ore-zinc-deep2.png diff --git a/res/sprites/blocks/environment/ore-tin-deep3.png b/res/sprites/blocks/environment/ore-zinc-deep3.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-deep3.png rename to res/sprites/blocks/environment/ore-zinc-deep3.png diff --git a/res/sprites/blocks/environment/ore-tin-surface1.png b/res/sprites/blocks/environment/ore-zinc-surface1.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-surface1.png rename to res/sprites/blocks/environment/ore-zinc-surface1.png diff --git a/res/sprites/blocks/environment/ore-tin-surface2.png b/res/sprites/blocks/environment/ore-zinc-surface2.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-surface2.png rename to res/sprites/blocks/environment/ore-zinc-surface2.png diff --git a/res/sprites/blocks/environment/ore-tin-surface3.png b/res/sprites/blocks/environment/ore-zinc-surface3.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin-surface3.png rename to res/sprites/blocks/environment/ore-zinc-surface3.png diff --git a/res/sprites/blocks/environment/ore-tin.png b/res/sprites/blocks/environment/ore-zinc.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin.png rename to res/sprites/blocks/environment/ore-zinc.png diff --git a/res/sprites/blocks/environment/ore-tin1.png b/res/sprites/blocks/environment/ore-zinc1.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin1.png rename to res/sprites/blocks/environment/ore-zinc1.png diff --git a/res/sprites/blocks/environment/ore-tin2.png b/res/sprites/blocks/environment/ore-zinc2.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin2.png rename to res/sprites/blocks/environment/ore-zinc2.png diff --git a/res/sprites/blocks/environment/ore-tin3.png b/res/sprites/blocks/environment/ore-zinc3.png similarity index 100% rename from res/sprites/blocks/environment/ore-tin3.png rename to res/sprites/blocks/environment/ore-zinc3.png diff --git a/res/sprites/blocks/power/tin-wire-pole-beam-end.png b/res/sprites/blocks/power/zinc-wire-pole-beam-end.png similarity index 100% rename from res/sprites/blocks/power/tin-wire-pole-beam-end.png rename to res/sprites/blocks/power/zinc-wire-pole-beam-end.png diff --git a/res/sprites/blocks/power/tin-wire-pole-beam.png b/res/sprites/blocks/power/zinc-wire-pole-beam.png similarity index 100% rename from res/sprites/blocks/power/tin-wire-pole-beam.png rename to res/sprites/blocks/power/zinc-wire-pole-beam.png diff --git a/res/sprites/blocks/power/tin-wire-pole.png b/res/sprites/blocks/power/zinc-wire-pole.png similarity index 100% rename from res/sprites/blocks/power/tin-wire-pole.png rename to res/sprites/blocks/power/zinc-wire-pole.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-0.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-0.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-0.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-0.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-1.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-1.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-1.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-1.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-10.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-10.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-10.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-10.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-11.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-11.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-11.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-11.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-12.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-12.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-12.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-12.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-13.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-13.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-13.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-13.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-14.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-14.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-14.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-14.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-15.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-15.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-15.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-15.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-2.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-2.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-2.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-2.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-3.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-3.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-3.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-3.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-4.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-4.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-4.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-4.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-5.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-5.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-5.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-5.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-6.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-6.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-6.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-6.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-7.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-7.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-7.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-7.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-8.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-8.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-8.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-8.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire-9.png b/res/sprites/blocks/power/zinc-wire/zinc-wire-9.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire-9.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire-9.png diff --git a/res/sprites/blocks/power/tin-wire/tin-wire.png b/res/sprites/blocks/power/zinc-wire/zinc-wire.png similarity index 100% rename from res/sprites/blocks/power/tin-wire/tin-wire.png rename to res/sprites/blocks/power/zinc-wire/zinc-wire.png diff --git a/res/sprites/blocks/production/tin-drill-item.png b/res/sprites/blocks/production/zinc-drill-item.png similarity index 100% rename from res/sprites/blocks/production/tin-drill-item.png rename to res/sprites/blocks/production/zinc-drill-item.png diff --git a/res/sprites/blocks/production/tin-drill-rotator.png b/res/sprites/blocks/production/zinc-drill-rotator.png similarity index 100% rename from res/sprites/blocks/production/tin-drill-rotator.png rename to res/sprites/blocks/production/zinc-drill-rotator.png diff --git a/res/sprites/blocks/production/tin-drill-top.png b/res/sprites/blocks/production/zinc-drill-top.png similarity index 100% rename from res/sprites/blocks/production/tin-drill-top.png rename to res/sprites/blocks/production/zinc-drill-top.png diff --git a/res/sprites/blocks/production/tin-drill.png b/res/sprites/blocks/production/zinc-drill.png similarity index 100% rename from res/sprites/blocks/production/tin-drill.png rename to res/sprites/blocks/production/zinc-drill.png diff --git a/res/sprites/blocks/storage/metropoly-team.png b/res/sprites/blocks/storage/metropoly-team.png deleted file mode 100644 index f7069b17..00000000 Binary files a/res/sprites/blocks/storage/metropoly-team.png and /dev/null differ diff --git a/res/sprites/blocks/storage/metropoly.png b/res/sprites/blocks/storage/metropoly.png deleted file mode 100644 index 6749224c..00000000 Binary files a/res/sprites/blocks/storage/metropoly.png and /dev/null differ diff --git a/res/sprites/blocks/walls/tin-wall-large.png b/res/sprites/blocks/walls/zinc-wall-large.png similarity index 100% rename from res/sprites/blocks/walls/tin-wall-large.png rename to res/sprites/blocks/walls/zinc-wall-large.png diff --git a/res/sprites/blocks/walls/tin-wall.png b/res/sprites/blocks/walls/zinc-wall.png similarity index 100% rename from res/sprites/blocks/walls/tin-wall.png rename to res/sprites/blocks/walls/zinc-wall.png diff --git a/res/sprites/items/tin.png b/res/sprites/items/zinc.png similarity index 100% rename from res/sprites/items/tin.png rename to res/sprites/items/zinc.png diff --git a/src/fos/content/FOSBlocks.java b/src/fos/content/FOSBlocks.java index acd0232d..ce250a26 100644 --- a/src/fos/content/FOSBlocks.java +++ b/src/fos/content/FOSBlocks.java @@ -57,21 +57,21 @@ public class FOSBlocks { // PRODUCTION crudeDrill, improvedDrill, proficientDrill, - rockCrusher, tinDrill, silverDrill, diamondDrill, vanadiumDrill, + rockCrusher, zincDrill, silverDrill, diamondDrill, vanadiumDrill, oreDetectorSmall, oreDetector, oreDetectorReinforced, oreDetectorOverclocked, // DISTRIBUTION - spaceDuct, spaceRouter, spaceBridge, itemCatapult, tinRouter, tinDistributor, tinJunction, tinBridge, tinBelt, tinSorter, flowGate, liquidConveyor, + spaceDuct, spaceRouter, spaceBridge, itemCatapult, zincRouter, zincDistributor, zincJunction, zincBridge, zincBelt, zincSorter, flowGate, liquidConveyor, // FLUIDS copperPipe, brassPipe, fluidJunction, fluidBridge, pumpjack, fluidRouter, fluidBarrel, fluidTank, // POWER - tinWire, copperWire, brassWire, tinWirePole, copperWirePole, brassWirePole, windTurbine, steamTurbine, heatGenerator, plasmaLauncher, solarPanelMedium, + zincWire, copperWire, brassWire, zincWirePole, copperWirePole, brassWirePole, windTurbine, steamTurbine, heatGenerator, plasmaLauncher, solarPanelMedium, copperBattery, brassBattery, // DEFENSE - tinWall, tinWallLarge, diamondWall, diamondWallLarge, vanadiumWall, vanadiumWallLarge, cuberiumWall, cuberiumWallLarge, + zincWall, zincWallLarge, diamondWall, diamondWallLarge, vanadiumWall, vanadiumWallLarge, cuberiumWall, cuberiumWallLarge, helix, sticker, dot, particulator, firefly, pulse, breakdown, rupture, thunder, cluster, judge, newJudge, bugSentry, matrixShieldProj, beamMender, beamMendProjector, landMine, @@ -82,7 +82,7 @@ public class FOSBlocks { tokiciteFloor, cyaniumWater, crimsonStoneWater, anniteWater, blubluWater, purpurWater, alienMoss, - oreTin, oreTinSurface, oreTinDeep, oreSilver, oreSilverDeep, oreLithium, oreDiamond, oreVanadium, oreVanadiumDeep, oreIridium, oreLuminium, + oreZinc, oreZincSurface, oreZincDeep, oreSilver, oreSilverDeep, oreLithium, oreDiamond, oreVanadium, oreVanadiumDeep, oreIridium, oreLuminium, hiveFloor, bugSpawn, // PROPS @@ -151,7 +151,7 @@ public static void load() { Seq.with() ), new IOEntry( - Seq.with(ItemStack.with(tin, 1, lithium, 1)), + Seq.with(ItemStack.with(zinc, 1, lithium, 1)), Seq.with() ), 90f @@ -177,11 +177,11 @@ public static void load() { hasPower = consumesPower = true; envEnabled = envRequired = Env.space; consumePower(4f); - consumeItems(with(tin, 10, silver, 10, titanium, 5)); + consumeItems(with(zinc, 10, silver, 10, titanium, 5)); consumeLiquid(oxygen, 3f/60f); outputItems = with(cuberium, 5); craftTime = 60f; - requirements(Category.crafting, with(aluminium, 100, tin, 75, silver, 75, titanium, 100)); + requirements(Category.crafting, with(aluminium, 100, zinc, 75, silver, 75, titanium, 100)); }}; sublimator = new AttributeCrafter("sublimator"){{ scaledHealth = 10; @@ -196,7 +196,7 @@ public static void load() { liquidOutputDirections = new int[]{1, 3}; craftTime = 10f; envEnabled = envRequired = Env.space; - requirements(Category.crafting, with(aluminium, 150, tin, 100, titanium, 100)); + requirements(Category.crafting, with(aluminium, 150, zinc, 100, titanium, 100)); }}; siliconSynthesizer = new GenericCrafter("silicon-synthesizer"){{ scaledHealth = 40; @@ -206,7 +206,7 @@ public static void load() { consumePower(8f); consumeItems(with(diamond, 1, sand, 8)); outputItems = with(silicon, 8); - requirements(Category.crafting, with(tin, 180, silver, 150, diamond, 100)); + requirements(Category.crafting, with(zinc, 180, silver, 150, diamond, 100)); drawer = new DrawMulti( new DrawRegion("-bottom"), new DrawArcSmelt(), @@ -223,10 +223,10 @@ public static void load() { liquidCapacity = 60f; squareSprite = false; consumePower(4.5f); - consumeItems(with(copper, 3, tin, 1)); + consumeItems(with(copper, 3, zinc, 1)); consumeLiquid(tokicite, 0.5f); outputItems = with(brass, 1); - requirements(Category.crafting, with(tin, 120, copper, 80, silicon, 160)); + requirements(Category.crafting, with(zinc, 120, copper, 80, silicon, 160)); craftEffect = FOSFx.brassSmelterCraft; drawer = new DrawMulti( //new DrawRegion("-bottom"), @@ -272,7 +272,7 @@ public static void load() { new DrawDefault(), new DrawOutputLiquids() //not to be confused with DrawLiquidOutputs, this one's modded! ); - requirements(Category.crafting, with(tin, 150, diamond, 100, silicon, 75, vanadium, 125)); + requirements(Category.crafting, with(zinc, 150, diamond, 100, silicon, 75, vanadium, 125)); }}; //endregion //region production @@ -283,13 +283,13 @@ public static void load() { squareSprite = false; drawSpinSprite = false; - drillMultipliers.put(tin, 2f); + drillMultipliers.put(zinc, 2f); drillMultipliers.put(silver, 2f); drillMultipliers.put(vanadium, 2f); consumeLiquid(water, 0.08f).boost(); - requirements(Category.production, with(tin, 10)); - researchCost = with(tin, 25); + requirements(Category.production, with(zinc, 10)); + researchCost = with(zinc, 25); //not usable in Uxerd envEnabled ^= Env.space; }}; @@ -299,13 +299,13 @@ public static void load() { drillTime = 200f; squareSprite = false; - drillMultipliers.put(tin, 2f); + drillMultipliers.put(zinc, 2f); drillMultipliers.put(silver, 2f); drillMultipliers.put(vanadium, 2f); consumePower(1f); consumeLiquid(water, 0.24f).boost(); - requirements(Category.production, with(tin, 45, silver, 30)); + requirements(Category.production, with(zinc, 45, silver, 30)); envEnabled ^= Env.space; }}; proficientDrill = new Drill("proficient-drill"){{ @@ -314,13 +314,13 @@ public static void load() { drillTime = 150f; squareSprite = false; - drillMultipliers.put(tin, 2f); + drillMultipliers.put(zinc, 2f); drillMultipliers.put(silver, 2f); drillMultipliers.put(vanadium, 2f); consumePower(6f); consumeLiquid(tokicite, 0.5f).boost(); - requirements(Category.production, with(tin, 50, brass, 25, silicon, 75, vanadium, 50, nickel, 45)); + requirements(Category.production, with(zinc, 50, brass, 25, silicon, 75, vanadium, 50, nickel, 45)); }}; rockCrusher = new HeatProducerDrill("rock-crusher"){{ @@ -334,20 +334,20 @@ public static void load() { researchCost = with(rawNethratium, 150); envRequired = envEnabled = Env.space; }}; - tinDrill = new UndergroundDrill("tin-drill"){{ + zincDrill = new UndergroundDrill("zinc-drill"){{ size = 2; tier = 3; drillTime = 360f; envEnabled |= Env.space; - requirements(Category.production, with(tin, 15)); - researchCost = with(tin, 50); + requirements(Category.production, with(zinc, 15)); + researchCost = with(zinc, 50); consumeLiquid(water, 0.08f).boost(); }}; silverDrill = new UndergroundDrill("silver-drill"){{ size = 2; tier = 4; drillTime = 300f; - requirements(Category.production, with(tin, 10, silver, 10)); + requirements(Category.production, with(zinc, 10, silver, 10)); consumeLiquid(water, 0.1f).boost(); }}; diamondDrill = new UndergroundDrill("diamond-drill"){{ @@ -364,7 +364,7 @@ public static void load() { tier = 6; drillTime = 165f; consumePower(3f); - requirements(Category.production, with(tin, 30, silver, 95, silicon, 50, vanadium, 50)); + requirements(Category.production, with(zinc, 30, silver, 95, silicon, 50, vanadium, 50)); consumeLiquid(tokicite, 0.25f).boost(); }}; oreDetectorSmall = new OreDetector("ore-detector-small"){{ @@ -379,9 +379,9 @@ public static void load() { health = 960; size = 3; squareSprite = false; - requirements(Category.production, with(tin, 50)); + requirements(Category.production, with(zinc, 50)); consumePower(0.5f); - researchCost = with(tin, 150); + researchCost = with(zinc, 150); }}; oreDetectorReinforced = new OreDetector("ore-detector-reinforced"){{ health = 2880; @@ -389,7 +389,7 @@ public static void load() { size = 3; speed = 0.4f; squareSprite = false; - requirements(Category.production, with(tin, 125, vanadium, 60)); + requirements(Category.production, with(zinc, 125, vanadium, 60)); consumePower(0.5f); }}; oreDetectorOverclocked = new OreDetector("ore-detector-overclocked"){{ @@ -399,22 +399,22 @@ public static void load() { effectColor = Color.valueOf("e37f36"); drillEfficiencyMultiplier = 1.5f; squareSprite = false; - requirements(Category.production, with(tin, 125, silicon, 60, vanadium, 30)); + requirements(Category.production, with(zinc, 125, silicon, 60, vanadium, 30)); consumePower(2f); }}; //endregion //region defense - tinWall = new Wall("tin-wall"){{ + zincWall = new Wall("zinc-wall"){{ scaledHealth = 800; size = 1; buildCostMultiplier = 3f; - requirements(Category.defense, with(tin, 6)); + requirements(Category.defense, with(zinc, 6)); }}; - tinWallLarge = new Wall("tin-wall-large"){{ + zincWallLarge = new Wall("zinc-wall-large"){{ scaledHealth = 800; size = 2; buildCostMultiplier = 3f; - requirements(Category.defense, with(tin, 24)); + requirements(Category.defense, with(zinc, 24)); }}; diamondWall = new Wall("diamond-wall"){{ scaledHealth = 1250; @@ -482,7 +482,7 @@ public static void load() { ); }}; ammo( - tin, new BasicBulletType(3f, 20){{ + zinc, new BasicBulletType(3f, 20){{ width = 3f; height = 6f; lifetime = 44f; trailColor = frontColor = FOSPal.tin; @@ -559,7 +559,7 @@ luminium, new BasicBulletType(){{ }} ); consumeCoolant(0.25f).boost(); - requirements(Category.turret, with(tin, 60, silver, 50)); + requirements(Category.turret, with(zinc, 60, silver, 50)); }}; sticker = new ItemTurret("sticker"){{ scaledHealth = 480; @@ -575,7 +575,7 @@ luminium, new BasicBulletType(){{ squareSprite = false; consumeLiquid(tokicite, 0.2f); ammo( - tin, new StickyBulletType(8f, 20, 90){{ + zinc, new StickyBulletType(8f, 20, 90){{ lifetime = 45f; width = height = 10f; trailColor = FOSPal.tinBack; @@ -609,7 +609,7 @@ diamond, new StickyBulletType(8f, 60, 90){{ }} ); }}; - requirements(Category.turret, with(tin, 75, silver, 50, silicon, 50)); + requirements(Category.turret, with(zinc, 75, silver, 50, silicon, 50)); }}; dot = new PowerTurret("dot"){{ scaledHealth = 480; @@ -733,7 +733,7 @@ vanadium, new BasicBulletType(6f, 120){{ drawer = new DrawTurret("lumoni-"); consumeCoolant(0.5f).boost(); coolantMultiplier = 2f; - requirements(Category.turret, with(tin, 200, silver, 125, silicon, 175, vanadium, 150)); + requirements(Category.turret, with(zinc, 200, silver, 125, silicon, 175, vanadium, 150)); }}; firefly = new LiquidTurret("firefly"){{ health = 2400; @@ -817,7 +817,7 @@ oil, new LiquidBulletType(oil){{ }} ); }}; - requirements(Category.turret, with(tin, 100, copper, 75, vanadium, 100)); + requirements(Category.turret, with(zinc, 100, copper, 75, vanadium, 100)); }}; pulse = new TractorBeamTurret("pulse"){{ health = 2400; @@ -862,7 +862,7 @@ nickel, new ShieldPierceBulletType(0.1f){{ requirements(Category.turret, with(silver, 150, silicon, 100, diamond, 75, nickel, 100)); }}; rupture = new ItemTurret("rupture"){{ - requirements(Category.turret, with(tin, 1)); + requirements(Category.turret, with(zinc, 1)); health = 8000; size = 4; minRange = 300f; @@ -1000,7 +1000,7 @@ luminium, new RailBulletType(){{ }} ); }}; - requirements(Category.turret, with(tin, 300, silver, 300, diamond, 400, silicon, 250, vanadium, 250)); + requirements(Category.turret, with(zinc, 300, silver, 300, diamond, 400, silicon, 250, vanadium, 250)); } //hard-coding time @@ -1172,7 +1172,7 @@ diamond, new MissileBulletType(5f, 5){{ }} ); }}; - requirements(Category.turret, with(tin, 3000, silver, 3000, diamond, 2500, silicon, 3000, vanadium, 1500, nickel, 1500, luminium, 1500)); + requirements(Category.turret, with(zinc, 3000, silver, 3000, diamond, 2500, silicon, 3000, vanadium, 1500, nickel, 1500, luminium, 1500)); }}; newJudge = new NewDeathRayTurret("judge2"){{ scaledHealth = 480; @@ -1206,7 +1206,7 @@ diamond, new MissileBulletType(5f, 5){{ new DrawLiquidRegion(), new DrawDefault() ); - requirements(Category.turret, with(tin, 3000, silver, 3000, diamond, 2500, silicon, 3000, vanadium, 1500, nickel, 1500, luminium, 1500)); + requirements(Category.turret, with(zinc, 3000, silver, 3000, diamond, 2500, silicon, 3000, vanadium, 1500, nickel, 1500, luminium, 1500)); }}; bugSentry = new PowerTurret("bug-sentry"){{ scaledHealth = 480; @@ -1286,7 +1286,7 @@ diamond, new MissileBulletType(5f, 5){{ range = 7; healPercent = 2.5f; reload = 60f; - requirements(Category.effect, with(tin, 50, silicon, 75, vanadium, 50)); + requirements(Category.effect, with(zinc, 50, silicon, 75, vanadium, 50)); }}; landMine = new CamoMine("land-mine"){{ @@ -1332,45 +1332,45 @@ diamond, new MissileBulletType(5f, 5){{ requirements(Category.distribution, with(aluminium, 120, lithium, 75, silver, 100, titanium, 125)); envRequired = envEnabled = Env.space; }}; - tinBelt = new PipeConveyor("tin-belt"){{ + zincBelt = new PipeConveyor("zinc-belt"){{ health = 10; speed = 0.05f; displayedSpeed = 6.9f; - researchCost = with(tin, 30); - requirements(Category.distribution, with(tin, 1)); + researchCost = with(zinc, 30); + requirements(Category.distribution, with(zinc, 1)); }}; - tinJunction = new Junction("tin-junction"){{ + zincJunction = new Junction("zinc-junction"){{ speed = 16f; - researchCost = with(tin, 60); - ((Conveyor)tinBelt).junctionReplacement = this; - requirements(Category.distribution, with(tin, 2)); + researchCost = with(zinc, 60); + ((Conveyor) zincBelt).junctionReplacement = this; + requirements(Category.distribution, with(zinc, 2)); }}; - tinRouter = new Router("tin-router"){{ - researchCost = with(tin, 90); - requirements(Category.distribution, with(tin, 3)); + zincRouter = new Router("zinc-router"){{ + researchCost = with(zinc, 90); + requirements(Category.distribution, with(zinc, 3)); }}; - tinDistributor = new Router("tin-distributor"){{ + zincDistributor = new Router("zinc-distributor"){{ size = 2; - researchCost = with(tin, 120); - requirements(Category.distribution, with(tin, 4)); + researchCost = with(zinc, 120); + requirements(Category.distribution, with(zinc, 4)); }}; - tinSorter = new Sorter("tin-sorter"){{ - researchCost = with(tin, 60, silver, 60); - requirements(Category.distribution, with(tin, 2, silver, 2)); + zincSorter = new Sorter("zinc-sorter"){{ + researchCost = with(zinc, 60, silver, 60); + requirements(Category.distribution, with(zinc, 2, silver, 2)); }}; flowGate = new FlowGate("flow-gate"){{ - researchCost = with(tin, 60, silver, 60); - requirements(Category.distribution, with(tin, 2, silver, 2)); + researchCost = with(zinc, 60, silver, 60); + requirements(Category.distribution, with(zinc, 2, silver, 2)); }}; - tinBridge = new BufferedItemBridge("tin-bridge"){{ + zincBridge = new BufferedItemBridge("zinc-bridge"){{ fadeIn = moveArrows = false; range = 4; speed = 44f; arrowSpacing = 6f; bufferCapacity = 14; - researchCost = with(tin, 150); - ((Conveyor)tinBelt).bridgeReplacement = this; - requirements(Category.distribution, with(tin, 10)); + researchCost = with(zinc, 150); + ((Conveyor) zincBelt).bridgeReplacement = this; + requirements(Category.distribution, with(zinc, 10)); }}; //endregion //region liquids @@ -1387,7 +1387,7 @@ diamond, new MissileBulletType(5f, 5){{ fluidJunction = new LiquidJunction("fluid-junction"){{ health = 50; solid = false; - requirements(Category.liquid, with(tin, 5, copper, 5)); + requirements(Category.liquid, with(zinc, 5, copper, 5)); ((Conduit)copperPipe).junctionReplacement = this; ((Conduit)brassPipe).junctionReplacement = this; }}; @@ -1395,7 +1395,7 @@ diamond, new MissileBulletType(5f, 5){{ health = 100; range = 4; liquidCapacity = 20f; - requirements(Category.liquid, with(tin, 5, copper, 10)); + requirements(Category.liquid, with(zinc, 5, copper, 10)); ((Conduit)copperPipe).bridgeReplacement = this; ((Conduit)brassPipe).bridgeReplacement = this; }}; @@ -1404,7 +1404,7 @@ diamond, new MissileBulletType(5f, 5){{ size = 3; pumpAmount = 0.25f; liquidCapacity = 45f; - requirements(Category.liquid, with(tin, 150, silicon, 50, copper, 100, vanadium, 75)); + requirements(Category.liquid, with(zinc, 150, silicon, 50, copper, 100, vanadium, 75)); }}; fluidRouter = new LiquidRouter("fluid-router"){{ scaledHealth = 75; @@ -1425,11 +1425,11 @@ diamond, new MissileBulletType(5f, 5){{ }}; //endregion //region power - tinWire = new PowerWire("tin-wire"){{ + zincWire = new PowerWire("zinc-wire"){{ health = 3; consumesPower = true; consumePower(2f / 60f); - requirements(Category.power, with(tin, 1)); + requirements(Category.power, with(zinc, 1)); }}; copperWire = new PowerWire("copper-wire"){{ health = 5; @@ -1442,16 +1442,16 @@ diamond, new MissileBulletType(5f, 5){{ //does not consume any power requirements(Category.power, with(brass, 1)); }}; - tinWirePole = new PowerWireNode("tin-wire-pole"){{ + zincWirePole = new PowerWireNode("zinc-wire-pole"){{ health = 30; consumesPower = true; consumePower(4f / 60f); range = 4; fogRadius = 1; squareSprite = false; - requirements(Category.power, with(tin, 5)); + requirements(Category.power, with(zinc, 5)); - ((PowerWire)tinWire).bridgeReplacement = this; + ((PowerWire) zincWire).bridgeReplacement = this; }}; copperWirePole = new PowerWireNode("copper-wire-pole"){{ health = 50; @@ -1480,8 +1480,8 @@ diamond, new MissileBulletType(5f, 5){{ health = 480; size = 2; powerProduction = 0.8f; - requirements(Category.power, with(tin, 40)); - researchCost = with(tin, 160); + requirements(Category.power, with(zinc, 40)); + researchCost = with(zinc, 160); squareSprite = false; drawer = new DrawMulti( new DrawDefault(), @@ -1506,7 +1506,7 @@ diamond, new MissileBulletType(5f, 5){{ new DrawLiquidTile(oil, 8f), new DrawDefault() ); - requirements(Category.power, with(tin, 75, brass, 150, vanadium, 100)); + requirements(Category.power, with(zinc, 75, brass, 150, vanadium, 100)); } // ugh @@ -1558,7 +1558,7 @@ public void setBars() { new DrawPower(), new DrawDefault() ); - requirements(Category.power, with(tin, 5, copper, 15)); + requirements(Category.power, with(zinc, 5, copper, 15)); }}; brassBattery = new Battery("brass-battery"){{ scaledHealth = 120; @@ -1569,7 +1569,7 @@ public void setBars() { new DrawPower(), new DrawDefault() ); - requirements(Category.power, with(tin, 25, brass, 60)); + requirements(Category.power, with(zinc, 25, brass, 60)); }}; //endregion //region environment & ores @@ -1700,16 +1700,16 @@ public void setBars() { purpurWater.asFloor().wall = this; }}; alienMoss = new OverlayFloor("alien-moss"); - oreTin = new UndergroundOreBlock("ore-tin"){{ - drop = tin; + oreZinc = new UndergroundOreBlock("ore-zinc"){{ + drop = zinc; }}; - oreTinSurface = new OreBlock("ore-tin-surface"){{ - itemDrop = tin; + oreZincSurface = new OreBlock("ore-zinc-surface"){{ + itemDrop = zinc; // this is stupid - can't place this on shallow water without it. needsSurface = false; }}; - oreTinDeep = new OreBlock("ore-tin-deep"){{ - itemDrop = tin; + oreZincDeep = new OreBlock("ore-zinc-deep"){{ + itemDrop = zinc; }}; oreSilver = new UndergroundOreBlock("ore-silver"){{ @@ -1770,8 +1770,8 @@ public void setBars() { solid = true; squareSprite = false; consumePower(3f); - researchCost = with(tin, 125, silver, 100); - requirements(Category.units, with(tin, 250, silver, 200)); + researchCost = with(zinc, 125, silver, 100); + requirements(Category.units, with(zinc, 250, silver, 200)); drawer = new DrawMulti( new DrawDefault(), new DrawFlame() @@ -1783,7 +1783,7 @@ public void setBars() { size = 3; configurable = false; consumePower(5f); - requirements(Category.units, with(tin, 100, silver, 75, silicon, 150)); + requirements(Category.units, with(zinc, 100, silver, 75, silicon, 150)); plans.add( new UnitPlan(FOSUnitTypes.assault, 20f * 60, with(silicon, 15, silver, 15)) ); @@ -1793,7 +1793,7 @@ public void setBars() { size = 3; configurable = false; consumePower(5f); - requirements(Category.units, with(tin, 100, silver, 75, silicon, 150)); + requirements(Category.units, with(zinc, 100, silver, 75, silicon, 150)); plans.add( new UnitPlan(FOSUnitTypes.radix, 20f * 60, with(silicon, 15, diamond, 10)) ); @@ -1803,9 +1803,9 @@ public void setBars() { size = 3; configurable = false; consumePower(5f); - requirements(Category.units, with(tin, 100, silver, 75, silicon, 150)); + requirements(Category.units, with(zinc, 100, silver, 75, silicon, 150)); plans.add( - new UnitPlan(FOSUnitTypes.sergeant, 20f * 60, with(silicon, 15, tin, 20)) + new UnitPlan(FOSUnitTypes.sergeant, 20f * 60, with(silicon, 15, zinc, 20)) ); }}; simpleReconstructor = new Reconstructor("simple-reconstructor"){{ @@ -1840,7 +1840,7 @@ public void setBars() { maxSpawn = 1; unitType = draug; produceTime = 1200f; - requirements(Category.units, with(tin, 150, silver, 250, diamond, 50)); + requirements(Category.units, with(zinc, 150, silver, 250, diamond, 50)); }}; //endregion //region storage @@ -1855,7 +1855,7 @@ public void setBars() { itemCapacity = 0; unitCapModifier = 0; squareSprite = false; - requirements(Category.effect, with(tin, 1500)); + requirements(Category.effect, with(zinc, 1500)); }}; coreFortress = new DetectorCoreBlock("core-fortress"){{ health = 2800; @@ -1865,7 +1865,7 @@ public void setBars() { unitType = FOSUnitTypes.lord; squareSprite = false; alwaysUnlocked = true; - requirements(Category.effect, with(tin, 2000, silver, 1250)); + requirements(Category.effect, with(zinc, 2000, silver, 1250)); }}; coreCity = new DetectorCoreBlock("core-city"){{ health = 4600; @@ -1875,7 +1875,7 @@ public void setBars() { unitType = FOSUnitTypes.king; squareSprite = false; researchCostMultiplier = 0.1f; - requirements(Category.effect, with(tin, 2500, silver, 2000, diamond, 750, silicon, 2500, vanadium, 1500)); + requirements(Category.effect, with(zinc, 2500, silver, 2000, diamond, 750, silicon, 2500, vanadium, 1500)); }}; coreMetropolis = new DetectorCoreBlock("core-metropolis"){{ health = 8000; @@ -1884,13 +1884,13 @@ public void setBars() { itemCapacity = 8000; unitType = FOSUnitTypes.king; //TODO: replace squareSprite = false; - requirements(Category.effect, with(tin, 150000)); + requirements(Category.effect, with(zinc, 150000)); }}; lightUnloader = new Unloader("light-unloader"){{ health = 60; size = 1; speed = 60f / 5f; - requirements(Category.effect, with(tin, 20, silver, 25)); + requirements(Category.effect, with(zinc, 20, silver, 25)); }}; //endregion //region special @@ -1918,8 +1918,8 @@ public void setBars() { configurable = true; buildCostMultiplier = 0.5f; consumePower(60); - consumeItems(with(titanium, 5000, tin, 5000, silver, 5000)); - requirements(Category.effect, with(aluminium, 10000, rawElithite, 8000, tin, 16000, silver, 15000, titanium, 10000, cuberium, 8000)); + consumeItems(with(titanium, 5000, zinc, 5000, silver, 5000)); + requirements(Category.effect, with(aluminium, 10000, rawElithite, 8000, zinc, 16000, silver, 15000, titanium, 10000, cuberium, 8000)); }}; cliffDetonator = new CliffExplosive("cliff-detonator"){{ health = 40; @@ -1942,7 +1942,7 @@ public void setBars() { consumePower(10f); consumeLiquid(hydrogen, 300); launching = coreFortress; - requirements(Category.effect, BuildVisibility.campaignOnly, with(aluminium, 5000, titanium, 3000, lithium, 2500, tin, 2500, silver, 2000, cuberium, 2000)); + requirements(Category.effect, BuildVisibility.campaignOnly, with(aluminium, 5000, titanium, 3000, lithium, 2500, zinc, 2500, silver, 2000, cuberium, 2000)); }}; mechResearchCore = new ResearchCore("mech-research-core"){{ scaledHealth = 160; @@ -1951,7 +1951,7 @@ public void setBars() { acceptsPayload = true; outputsPayload = false; consumePower(3f); - requirements(Category.effect, BuildVisibility.debugOnly, with(tin, 250, silver, 300, silicon, 150)); + requirements(Category.effect, BuildVisibility.debugOnly, with(zinc, 250, silver, 300, silicon, 150)); }}; liquidConveyor = new LiquidConveyor("l-c"){{ diff --git a/src/fos/content/FOSItems.java b/src/fos/content/FOSItems.java index 52879089..86ade41b 100644 --- a/src/fos/content/FOSItems.java +++ b/src/fos/content/FOSItems.java @@ -9,7 +9,7 @@ import static mindustry.content.Items.*; public class FOSItems { - public static Item rawNethratium, rawElbium, rawElithite, aluminium, tin, silver, lithium, brass, sulphur, cuberium, diamond, vanadium, nickel, luminium; + public static Item rawNethratium, rawElbium, rawElithite, aluminium, zinc, silver, lithium, brass, sulphur, cuberium, diamond, vanadium, nickel, luminium; public static Seq uxerdItems = new Seq<>(), lumoniItems = new Seq<>(); @@ -27,7 +27,7 @@ public static void load(){ aluminium = new Item("aluminium", Color.valueOf("de8900")){{ radioactivity = 0.1f; }}; - tin = new Item("tin", Color.valueOf("85b374")){{ + zinc = new Item("zinc", Color.valueOf("85b374")){{ hardness = 2; cost = 1.2f; }}; @@ -74,7 +74,7 @@ public void loadIcon(){ } }; - uxerdItems.addAll(rawNethratium, rawElbium, rawElithite, aluminium, tin, silver, lithium, titanium, cuberium); - lumoniItems.addAll(copper, tin, silver, diamond, sand, silicon, brass, vanadium, nickel, luminium); + uxerdItems.addAll(rawNethratium, rawElbium, rawElithite, aluminium, zinc, silver, lithium, titanium, cuberium); + lumoniItems.addAll(copper, zinc, silver, diamond, sand, silicon, brass, vanadium, nickel, luminium); } } diff --git a/src/fos/content/FOSSectors.java b/src/fos/content/FOSSectors.java index 565e6dfc..d8b410ca 100644 --- a/src/fos/content/FOSSectors.java +++ b/src/fos/content/FOSSectors.java @@ -8,7 +8,7 @@ public class FOSSectors { public static SectorPreset /* Serpulo */ siloTerminal, - /* Lumoni */ awakening, ruins, intruders, intrudersChallenge, citadel, tinMiningSite, conflict; + /* Lumoni */ awakening, ruins, intruders, intrudersChallenge, citadel, zincMiningSite, conflict; public static void load() { /* @@ -44,7 +44,7 @@ public static void load() { captureWave = 21; }}; - tinMiningSite = new SectorPreset("tin-mining-site", lumoni, 71){{ + zincMiningSite = new SectorPreset("zinc-mining-site", lumoni, 71){{ difficulty = 5; }}; diff --git a/src/fos/content/FOSUnitTypes.java b/src/fos/content/FOSUnitTypes.java index 88d5c4e7..8703ff3d 100644 --- a/src/fos/content/FOSUnitTypes.java +++ b/src/fos/content/FOSUnitTypes.java @@ -37,7 +37,7 @@ import static arc.graphics.g2d.Draw.color; import static arc.graphics.g2d.Lines.stroke; import static ent.anno.Annotations.EntityDef; -import static fos.content.FOSItems.tin; +import static fos.content.FOSItems.zinc; import static fos.content.FOSStatuses.*; import static mindustry.Vars.*; @@ -1449,7 +1449,7 @@ public void update(Unit unit, WeaponMount mount) { isEnemy = false; useUnitCap = false; - mineItems = Seq.with(tin); + mineItems = Seq.with(zinc); mineTier = 2; mineSpeed = 1.2f; diff --git a/src/fos/content/FOSWeaponModules.java b/src/fos/content/FOSWeaponModules.java index 573448d3..37be9591 100644 --- a/src/fos/content/FOSWeaponModules.java +++ b/src/fos/content/FOSWeaponModules.java @@ -76,7 +76,7 @@ public static void load() { }}; }} ); - reqs = with(tin, 75, silver, 75); + reqs = with(zinc, 75, silver, 75); researchCost = empty; }}; standard3 = new WeaponSet("standard3", new Weapon("fos-standard-weapon3"){{ @@ -93,7 +93,7 @@ public static void load() { lifetime = 60f; homingPower = 0.8f; }}; - }}).reqs(with(tin, 250, silicon, 200, vanadium, 100)); + }}).reqs(with(zinc, 250, silicon, 200, vanadium, 100)); //TODO: placeholders standard4 = new WeaponSet("standard4", new Weapon("fos-standard-weapon4")).reqs(with(lead, 1)); standard5 = new WeaponSet("standard5", new Weapon("fos-standard-weapon5"){{ @@ -134,7 +134,7 @@ public static void load() { splashDamageRadius = 10f; }}; }}; - }}).reqs(with(tin, 500, silver, 500, vanadium, 300, nickel, 250, luminium, 200)); + }}).reqs(with(zinc, 500, silver, 500, vanadium, 300, nickel, 250, luminium, 200)); // SHOTGUNS shotgun1 = new WeaponSet("shotgun1"){{ @@ -185,7 +185,7 @@ public static void load() { hitEffect = Fx.hitBulletSmall; knockback = 3f; }}; - }}).reqs(with(tin, 60, silver, 90)); + }}).reqs(with(zinc, 60, silver, 90)); shotgun3 = new WeaponSet("shotgun3", new Weapon("fos-shotgun-mount3"){{ x = y = 0; alternate = mirror = false; @@ -214,7 +214,7 @@ public static void load() { knockback = 4f; }}; }}; - }}).reqs(with(tin, 200, silver, 50, silicon, 200, vanadium, 100)); + }}).reqs(with(zinc, 200, silver, 50, silicon, 200, vanadium, 100)); //TODO: placeholders shotgun4 = new WeaponSet("shotgun4", new Weapon()).reqs(with(lead, 1)); shotgun5 = new WeaponSet("shotgun5", new Weapon()).reqs(with(lead, 1)); @@ -254,7 +254,7 @@ public static void load() { collidesGround = true; healPercent = 5; }}; - }}).reqs(with(tin, 50, silver, 100)); + }}).reqs(with(zinc, 50, silver, 100)); support3 = new WeaponSet("support3"){{ abilities.add( new EnergyFieldAbility(80f, 40f, 64f){{ @@ -268,7 +268,7 @@ public static void load() { damageEffect = Fx.chainLightning; }} ); - reqs = with(tin, 75, silver, 150, vanadium, 150); + reqs = with(zinc, 75, silver, 150, vanadium, 150); }}; // BOSS WEAPONS @@ -291,7 +291,7 @@ public static void load() { new UnitSpawnAbility(FOSUnitTypes.legionnaireReplica, 600, 16, 0) ); }); - }}.reqs(with(tin, 200, silver, 125, silicon, 150)).produceTime(60 * 20); + }}.reqs(with(zinc, 200, silver, 125, silicon, 150)).produceTime(60 * 20); citadelStickyLauncher = new WeaponSet("citadel-stickybomb-launcher"){ { description = Core.bundle.getOrNull(getContentType() + "." + this.name + ".description" + (Vars.mobile ? "-mobile" : "")); @@ -322,7 +322,7 @@ public static void load() { }}; }} ); - reqs = with(tin, 150, diamond, 75, silicon, 150); + reqs = with(zinc, 150, diamond, 75, silicon, 150); } }; } diff --git a/src/fos/content/LumoniTechTree.java b/src/fos/content/LumoniTechTree.java index 4f40658d..0561729f 100644 --- a/src/fos/content/LumoniTechTree.java +++ b/src/fos/content/LumoniTechTree.java @@ -27,22 +27,22 @@ public static void load() { ); // TRANSPORT. TODO - node(tinBelt, () -> - node(tinJunction, () -> - node(tinRouter, () -> { - node(tinDistributor); - node(tinSorter, () -> + node(zincBelt, () -> + node(zincJunction, () -> + node(zincRouter, () -> { + node(zincDistributor); + node(zincSorter, () -> node(flowGate) ); - node(tinBridge); + node(zincBridge); }) ) ); // POWER. TODO node(windTurbine, () -> { - node(tinWire, () -> { - node(tinWirePole); + node(zincWire, () -> { + node(zincWirePole); node(copperWire, () -> { node(copperWirePole); node(brassWire, () -> { @@ -60,8 +60,8 @@ public static void load() { }); // WALLS - node(tinWall, () -> { - node(tinWallLarge); + node(zincWall, () -> { + node(zincWallLarge); node(diamondWall, () -> { node(diamondWallLarge); node(vanadiumWall, () -> { @@ -100,7 +100,7 @@ public static void load() { // DRILLS node(crudeDrill, () -> { node(improvedDrill, Seq.with(new OnSector(ruins)), () -> { - node(draugFactory, Seq.with(new SectorComplete(tinMiningSite)), () -> + node(draugFactory, Seq.with(new SectorComplete(zincMiningSite)), () -> node(draug, ItemStack.with(), Seq.with(new Research(draugFactory)), () -> {}) ); soontm(); @@ -111,7 +111,7 @@ public static void load() { }); // UNDERGROUND DRILLS - node(tinDrill, () -> + node(zincDrill, () -> node(silverDrill, () -> { node(diamondDrill, Seq.with(new OnSector(intruders)), () -> { node(surfaceDetonator); @@ -235,7 +235,7 @@ public static void load() { }); // ITEMS - nodeProduce(tin, () -> { + nodeProduce(zinc, () -> { nodeProduce(silver, () -> nodeProduce(diamond, () -> { nodeProduce(silicon, () -> {}); @@ -274,7 +274,7 @@ public static void load() { node(conflict, Seq.with(new SectorComplete(intruders)), () -> { soontm(); }); - node(tinMiningSite, Seq.with(new SectorComplete(intruders)), () -> { + node(zincMiningSite, Seq.with(new SectorComplete(intruders)), () -> { soontm(); }); node(intrudersChallenge, Seq.with(new SectorComplete(intruders)), () -> {}); diff --git a/src/fos/content/UxerdTechTree.java b/src/fos/content/UxerdTechTree.java index 9c7cb47e..3b57b3f1 100644 --- a/src/fos/content/UxerdTechTree.java +++ b/src/fos/content/UxerdTechTree.java @@ -17,7 +17,7 @@ public class UxerdTechTree { public static void load() { costs.put(aluminium, 0.05f); costs.put(lithium, 0.08f); - costs.put(tin, 0.06f); + costs.put(zinc, 0.06f); costs.put(silver, 0.06f); costs.put(cuberium, 0.03f); costs.put(titanium, 0.08f); @@ -37,12 +37,12 @@ public static void load() { nodeProduce(FOSFluids.oxygen, () -> {}); })); nodeProduce(rawElbium, () -> { - nodeProduce(tin, () -> {}); + nodeProduce(zinc, () -> {}); nodeProduce(lithium, () -> {}); }); nodeProduce(rawElithite, () -> { nodeProduce(titanium, () -> {}); - nodeProduce(silver, () -> nodeProduce(cuberium, Seq.with(new Research(tin), new Research(titanium), new Research(FOSFluids.oxygen)), () -> {})); + nodeProduce(silver, () -> nodeProduce(cuberium, Seq.with(new Research(zinc), new Research(titanium), new Research(FOSFluids.oxygen)), () -> {})); }); node(rockCrusher, Seq.with(new OnPlanet(FOSPlanets.uxerd)), () -> node(heatGenerator, () -> { node(solarPanelMedium); @@ -56,7 +56,7 @@ public static void load() { }); //node(plasmaLauncher); node(oreDetectorSmall, () -> - node(tinDrill) + node(zincDrill) ); })); }); diff --git a/src/fos/maps/generators/LumoniPlanetGenerator.java b/src/fos/maps/generators/LumoniPlanetGenerator.java index f76bccc8..3774cc2d 100644 --- a/src/fos/maps/generators/LumoniPlanetGenerator.java +++ b/src/fos/maps/generators/LumoniPlanetGenerator.java @@ -272,7 +272,7 @@ void connect(Room to) { inverseFloodFill(tiles.getn(spawn.x, spawn.y)); - Seq ores = Seq.with(oreTin, oreTinSurface, oreSilver); + Seq ores = Seq.with(oreZinc, oreZincSurface, oreSilver); if (sector.id != 91) { ores.add(oreDiamond); ores.add(oreCopper); @@ -302,7 +302,7 @@ void connect(Room to) { //map ores ores(ores); //early-game ores next to player's core - ores(Seq.with(oreTinSurface, oreTin, oreSilver), spawn.x, spawn.y, 20); + ores(Seq.with(oreZincSurface, oreZinc, oreSilver), spawn.x, spawn.y, 20); trimDark(); median(2); diff --git a/src/fos/maps/generators/UxerdAsteroidGenerator.java b/src/fos/maps/generators/UxerdAsteroidGenerator.java index 16348fc9..8908bae3 100644 --- a/src/fos/maps/generators/UxerdAsteroidGenerator.java +++ b/src/fos/maps/generators/UxerdAsteroidGenerator.java @@ -138,7 +138,7 @@ public void generate() { }); //generate tin and lithium on elbium - ore(oreTin, elbium, 4f, 0.6f * tinScl); + ore(oreZinc, elbium, 4f, 0.6f * tinScl); ore(oreLithium, elbium, 4f, 0.8f * lithiumScl); //generate silver and titanium on elithite diff --git a/src/fos/type/blocks/distribution/PipeConveyor.java b/src/fos/type/blocks/distribution/PipeConveyor.java index 0b35190d..f6a45398 100644 --- a/src/fos/type/blocks/distribution/PipeConveyor.java +++ b/src/fos/type/blocks/distribution/PipeConveyor.java @@ -21,7 +21,7 @@ public PipeConveyor(String name) { public void load() { if (!headless) { String prefix = ConveyorSpritesPacker.getPrefix(); - ConveyorSpritesPacker.generateRegions(Core.atlas.find(prefix + "-tin-belt"), prefix); + ConveyorSpritesPacker.generateRegions(Core.atlas.find(prefix + "-" + name.replaceFirst("fos-", "")), prefix); } pipeRegions = new TextureRegion[5]; diff --git a/src/fos/type/blocks/special/SurfaceExplosive.java b/src/fos/type/blocks/special/SurfaceExplosive.java index 49edf908..c8fd9a7b 100644 --- a/src/fos/type/blocks/special/SurfaceExplosive.java +++ b/src/fos/type/blocks/special/SurfaceExplosive.java @@ -85,7 +85,7 @@ public void updateTile() { // hard-coded for now // TODO: come up with a better solution? public Block deepTile(Block ore) { - return ore == FOSBlocks.oreTin ? FOSBlocks.oreTinDeep : + return ore == FOSBlocks.oreZinc ? FOSBlocks.oreZincDeep : ore == FOSBlocks.oreSilver ? FOSBlocks.oreSilverDeep : ore == FOSBlocks.oreVanadium ? FOSBlocks.oreVanadiumDeep : air; diff --git a/src/fos/ui/FOSHints.java b/src/fos/ui/FOSHints.java index de471945..767df318 100644 --- a/src/fos/ui/FOSHints.java +++ b/src/fos/ui/FOSHints.java @@ -43,7 +43,7 @@ public enum FOSHint implements HintsFragment.Hint { () -> false ), drillsPoweredByDetector( - () -> placedBlocks.contains(tinDrill) && placedBlocks.contains(oreDetector), + () -> placedBlocks.contains(zincDrill) && placedBlocks.contains(oreDetector), () -> false ), sandUnderground( diff --git a/src/fos/ui/menus/FOSMenus.java b/src/fos/ui/menus/FOSMenus.java index 509c16db..169e7a10 100644 --- a/src/fos/ui/menus/FOSMenus.java +++ b/src/fos/ui/menus/FOSMenus.java @@ -53,7 +53,7 @@ public static void load() { lumoniTerrain = new TerrainMenuBackground(){ @Override public void generate(Tiles tiles) { - Seq ores = Seq.with(oreTinSurface, Blocks.oreCopper, oreDiamond, oreLuminium); + Seq ores = Seq.with(oreZincSurface, Blocks.oreCopper, oreDiamond, oreLuminium); int offset = Mathf.floor((float) (Math.random() * 100000)); int s2 = offset + 1, s3 = offset + 2; Block[][] blocks = new Block[][]{