mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-13 08:15:04 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c80e800ac9
@ -1591,6 +1591,8 @@ lst.sensor = Mengambil data dari bangunan atau unit.
|
||||
lst.set = Menentukan sebuah variabel.
|
||||
lst.operation = Melakukan operasi pada 1-2 variabel.
|
||||
lst.end = Loncati ke awal dari tumpukan perintah.
|
||||
lst.wait = Memberi jeda dalam detik yang ditentukan.
|
||||
lst.lookup = Mencari tipe barang/cairan/unit/blok dengan ID.\nJumlah hitungan dari setiap tipe dapat dilihat dengan:\n[accent]@unitCount[] / [accent]@itemCount[] / [accent]@liquidCount[] / [accent]@blockCount[]
|
||||
lst.jump = Loncati secara bersyarat ke pernyataan berikutnya.
|
||||
lst.unitbind = Menautkan ke unit jenis berikutnya, dan menyimpannya di [accent]@unit[].
|
||||
lst.unitcontrol = Mengendalikan unit yang saat ini dihubungkan.
|
||||
|
@ -1242,12 +1242,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
||||
diagonal = !diagonal;
|
||||
}
|
||||
|
||||
int endRotation = -1;
|
||||
if(diagonal){
|
||||
var start = world.build(startX, startY);
|
||||
var end = world.build(endX, endY);
|
||||
if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
|
||||
&& block.canReplace(end.block) && block.canReplace(start.block)){
|
||||
points = Placement.upgradeLine(startX, startY, endX, endY);
|
||||
endRotation = end.rotation;
|
||||
}else{
|
||||
points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
|
||||
}
|
||||
@ -1281,6 +1283,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
||||
int result = baseRotation;
|
||||
if(next != null){
|
||||
result = Tile.relativeTo(point.x, point.y, next.x, next.y);
|
||||
}else if(endRotation != -1){
|
||||
result = endRotation;
|
||||
}else if(block.conveyorPlacement && i > 0){
|
||||
Point2 prev = points.get(i - 1);
|
||||
result = Tile.relativeTo(prev.x, prev.y, point.x, point.y);
|
||||
|
@ -101,7 +101,7 @@
|
||||
},
|
||||
{
|
||||
"name": "Sakura",
|
||||
"address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587"]
|
||||
"address": ["160.16.207.141", "160.16.207.141:21527", "160.16.207.141:31587", "160.16.207.141:26810"]
|
||||
},
|
||||
{
|
||||
"name": "MeowLand",
|
||||
|
Loading…
Reference in New Issue
Block a user