Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-10 15:05:23 +03:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-08-07 18:16:51 -04:00
parent 2d504521b1
commit 703f034054
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -984,7 +984,7 @@ block.liquid-tank.description = Stores a large amount of liquids. Use for creati
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.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
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.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks.
block.power-node-large.description = An advanced power node with greater range and more connections.
block.surge-tower.description = An extremely long-range power node with fewer available connections.
block.battery.description = Stores power as a buffer in times of surplus energy. Outputs power in times of deficit.

5
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@ -155,7 +155,6 @@ public class MobileInput extends InputHandler implements GestureListener{
return req;
}
}else{
r1.setSize(other.block().size * tilesize);
r1.setCenter(other.worldx() + other.block().offset(), other.worldy() + other.block().offset());
@ -248,7 +247,7 @@ public class MobileInput extends InputHandler implements GestureListener{
/** Draws a placement icon for a specific block. */
void drawPlace(int x, int y, Block block, int rotation, int prevX, int prevY, int prevRotation){
if(validPlace(x, y, block, rotation)){
if(validPlace(x, y, block, rotation) && !checkOverlapPlacement(x, y, block)){
block.getPlaceDraw(placeDraw, rotation, prevX, prevY, prevRotation);
Draw.color();
@ -509,7 +508,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(mode == placing && isPlacing()){
iterateLine(lineStartX, lineStartY, tileX, tileY, l -> {
Tile tile = world.tile(l.x, l.y);
if(tile != null && hasRequest(tile)){
if(tile != null && checkOverlapPlacement(tile.x, tile.y, block)){
return;
}

1
settings.gradle
View File

@ -35,6 +35,7 @@ if(!hasProperty("release")){
use(':Arc:backends:backend-robovm')
use(':Arc:backends:backend-headless')
}
if(new File(settingsDir, '../debug').exists()){
use(':debug')
}