From de23ef5d35dc5375edf4a2d16d027cc64db4edd7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 2 Nov 2018 19:46:56 -0400 Subject: [PATCH 1/2] Fixed crash --- core/src/io/anuke/mindustry/core/Control.java | 2 +- core/src/io/anuke/mindustry/input/MobileInput.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index a126e0c699..832eab7581 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -124,7 +124,7 @@ public class Control extends Module{ Events.on(WorldLoadGraphicsEvent.class, event -> { if(mobile){ - Core.camera.position.set(players[0].x, players[0].y, 0); + Gdx.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0)); } }); diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 3e312f9cee..d64d5349bd 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -574,13 +574,14 @@ public class MobileInput extends InputHandler implements GestureListener{ consumed = true; player.dropCarry(); //drop off unit }else{ - Unit unit = Units.getClosest(player.getTeam(), Graphics.world(x, y).x, Graphics.world(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight); + threads.run(() -> { + Unit unit = Units.getClosest(player.getTeam(), Graphics.world(x, y).x, Graphics.world(x, y).y, 4f, u -> !u.isFlying() && u.getMass() <= player.mech.carryWeight); - if(unit != null){ - player.moveTarget = unit; - consumed = true; - Effects.effect(Fx.select, unit.getX(), unit.getY()); - } + if(unit != null){ + player.moveTarget = unit; + Effects.effect(Fx.select, unit.getX(), unit.getY()); + } + }); } } From 963269a685a665a3efb86581c6c97cad385939fb Mon Sep 17 00:00:00 2001 From: Timmeey86 Date: Sat, 3 Nov 2018 00:49:56 +0100 Subject: [PATCH 2/2] Added descriptions for all unlockables which didn't have them (#297) * Added english descriptions for walls and doors * Added english descriptions for walls and doors * Added descriptions for projectors, mine and turrets * Added descriptions for transport blocks and two smelters * Added descriptions for crafters * Added descriptions for power-related items and containers * Added descriptions for drills and extractors * Added descriptions for ship/mech pads * Added/updated unit/factory descriptions * Added english descriptions for walls and doors * Added descriptions for projectors, mine and turrets * Added descriptions for transport blocks and two smelters * Added descriptions for crafters * Added descriptions for power-related items and containers * Added descriptions for drills and extractors * Added descriptions for ship/mech pads * Added/updated unit/factory descriptions * Added descriptions for liquids and related blocks. * Updated descriptions based on discord discussion. * Updated descriptions as requested by Anuken * Updated shock mine description --- core/assets/bundles/bundle.properties | 113 +++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 8aa7829c85..3e8fe5a1db 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -530,15 +530,11 @@ block.conveyor.name = Conveyor block.titanium-conveyor.name = Titanium Conveyor block.junction.name = Junction block.router.name = Router -block.router.description = Splits items into all 4 directions. block.distributor.name = Distributor -block.distributor.description = A splitter that can split items into 8 directions. block.sorter.name = Sorter block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right. block.overflow-gate.name = Overflow Gate block.overflow-gate.description = A combination splitter and router that only outputs to the left and right if the front path is blocked. -block.bridgeconveyor.name = Bridge Conveyor -block.bridgeconveyor.description = A conveyor that can go over other blocks, for up to two total blocks. block.smelter.name = Smelter block.arc-smelter.name = Arc Smelter block.silicon-smelter.name = Silicon Smelter @@ -673,4 +669,113 @@ tutorial.router = Factories need resources to function.\nCreate a router to spli tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary. tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs. block.core.description = The most important building in the game. +block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves. +block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles. +block.dense-alloy-wall.description = A standard defensive block.\nAdequate protection from enemies. +block.dense-alloy-wall-large.description = A standard defensive block.\nAdequate protection from enemies.\nSpans multiple tiles. +block.thorium-wall.description = A strong defensive block.\nGood protection from enemies. +block.thorium-wall-large.description = A strong defensive block.\nGood protection from enemies.\nSpans multiple tiles. +block.phase-wall.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful. +block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles. +block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker. +block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles. +block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through. +block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\nSpans multiple tiles. +block.mend-projector.description = Periodically heals buildings in its vicinity. +block.overdrive-projector.description = Increases the speed of nearby buildings like drills and conveyors. +block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage through bullets. +block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy. +block.duo.description = A small, cheap turret. +block.arc.description = A small turret which shoots electricity in a random arc towards the enemy. +block.hail.description = A small artillery turret. +block.lancer.description = A medium-sized turret which shoots charged electricity beams. +block.wave.description = A medium-sized rapid-fire turret which shoots liquid bubbles. +block.salvo.description = A medium-sized turret which fires shots in salvos. +block.swarmer.description = A medium-sized turret which shoots burst missiles. +block.ripple.description = A large artillery turret which fires several shots simultaneously. +block.cyclone.description = A large rapid fire turret. +block.fuse.description = A large turret which shoots powerful short-range beams. +block.spectre.description = A large turret which shoots two powerful bullets at once. +block.meltdown.description = A large turret which shoots powerful long-range beams. +block.conveyor.description = Basic item transport block. Moved items forward and automatically deposits them into turrets or crafters. Rotatable. +block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors. +block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles. +block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations. +block.mass-driver.description = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range. +block.smelter.description = Burns coal for smelting copper and lead into dense alloy. +block.arc-smelter.description = Smelts copper and lead into dense alloy by using an external power source. +block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon. +block.plastanium-compressor.description = Produces plastanium from oil and titanium. +block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand. +block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper. +block.pulverizer.description = Crushes stone into sand. Useful when there is a lack of natural sand. +block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. +block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound. +block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. +block.solidifer.description = Cools lava to stone at a fast pace. +block.melter.description = Heats up stone to very high temperatures to obtain lava. +block.incinerator.description = Gets rid of any excess item or liquid. +block.biomattercompressor.description = Compresses biomatter in order to retrieve oil. +block.separator.description = Exposes stone to water pressure in order to obtain various minerals contained in the stone. +block.centrifuge.description = More efficient than the separator, but also more expensive to build and requires power. +block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks. +block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes. +block.battery.description = Stores power whenever there is an abundance and provides power whenever there is a shortage, as long as there is capacity left. +block.battery-large.description = Stores much more power than a regular battery. +block.combustion-generator.description = Generates power by burning oil or flammable materials. +block.turbine-generator.description = More efficient than a combustion generator, but requires additional water. +block.thermal-generator.description = Generates a large amount of power from lava. +block.solar-panel.description = Provides a small amount of power from the sun. +block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build. +block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. +block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor. +block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader. +block.container.description = Stores a small amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the container. +block.vault.description = Stores a large amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the vault. +block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely. +block.pneumatic-drill.description = An improved drill which is faster and able to process harder materials by making use of air pressure. +block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill. +block.blast-drill.description = The ultimate drill. Requires large amounts of power. +block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby. +block.cultivator.description = Cultivates the soil with water in order to obtain biomatter. +block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby. +block.dart-ship-pad.description = Leave your current vessel and change into a basic fighter aircraft.\nUse the pad by double tapping while standing on it. +block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it. +block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it. +block.glaive-ship-pad.description = Leave your current vessel and change into a large, well-armored gunship.\nUse the pad by double tapping while standing on it. +block.tau-mech-pad.description = Leave your current vessel and change into a support mech which can heal friendly buildings and units.\nUse the pad by double tapping while standing on it. +block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it. +block.omega-mech-pad.description = Leave your current vessel and change into a bulky and well-armored mech, made for front-line assaults.\nUse the pad by double tapping while standing on it. +block.spirit-factory.description = Produces light drones which mine ore and repair blocks. +block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone. +block.wraith-factory.description = Produces fast, hit-and-run interceptor units. +block.ghoul-factory.description = Produces heavy carpet bombers. +block.dagger-factory.description = Produces basic ground units. +block.titan-factory.description = Produces advanced, armored ground units. +block.fortress-factory.description = Produces heavy artillery ground units. +block.revenant-factory.description = Produces heavy laser ground units. +block.repair-point.description = Continuously heals the closest damaged unit in its vicinity. +block.command-center.description = Allows changing friendly AI behavior. Currently, attack, retreat and patrol commands are supported. +block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits. +block.pulse-conduit.description = Advanced liquid transport block. Transports liquids faster and stores more than standard conduits. +block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles. +block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets. +block.liquid-tank.description = Stores a large amount of liquids. Use it for creating buffers when there is a non-constant demand of materials or as a safeguard for cooling vital blocks. +block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations. +block.bridge-conduit.description = Advanced liquid transport block. Allows transporting liquids over up to 3 tiles of any terrain or building. +block.mechanical-pump.description = A cheap pump with slow output, but no power consumption. +block.rotary-pump.description = An advanced pump which doubles up speed by using power. +block.thermal-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava. +liquid.water.description = Commonly used for cooling machines and waste processing. +liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets. +liquid.oil.description = Can be burnt, exploded or used as a coolant. +liquid.cryofluid.description = The most efficient liquid for cooling things down. + +# TODO: These descriptions have been changed. Let translators find them easily. +block.router.description = Accepts items from one direction and outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets. +block.distributor.description = An advanced router which splits items to up to 7 other directions equally. +block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building. + +# TODO: To be deleted in all translations: block.bridgeconveyor.name, block.bridgeconveyor.description +# (There are additional elements for bridge-conveyor already) text.filename = File Name\: