mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 08:15:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-06-29 12:21:56 -04:00
commit c7bd9dd0fa
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/editor/WaveGraph.java
View File

@ -53,7 +53,7 @@ public class WaveGraph extends Table{
for(int i = 0; i < values.length; i++){
int val = values[i][type.id];
float cx = graphX + i*spacing, cy = 2f + graphY + val * (graphH - 4f) / max;
float cx = graphX + i*spacing, cy = graphY + val * graphH / max;
Lines.linePoint(cx, cy);
}
@ -69,7 +69,7 @@ public class WaveGraph extends Table{
sum += values[i][type.id];
}
float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxTotal;
float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal;
Lines.linePoint(cx, cy);
}
@ -84,7 +84,7 @@ public class WaveGraph extends Table{
sum += (type.health) * values[i][type.id];
}
float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth;
float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth;
Lines.linePoint(cx, cy);
}
@ -92,29 +92,29 @@ public class WaveGraph extends Table{
}
//how many numbers can fit here
float totalMarks = (height - offsetY - getMarginBottom() *2f - 1f) / (lay.height * 2);
float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2);
int markSpace = Math.max(1, Mathf.ceil(max / totalMarks));
Draw.color(Color.lightGray);
for(int i = 0; i < max; i += markSpace){
float cy = 2f + y + i * (height - 4f) / max + offsetY, cx = x + offsetX;
float cy = graphY + i * graphH / max, cx = graphX;
//Lines.line(cx, cy, cx + len, cy);
lay.setText(font, "" + i);
font.draw("" + i, cx, cy + lay.height/2f - Scl.scl(3f), Align.right);
font.draw("" + i, cx, cy + lay.height/2f, Align.right);
}
float len = Scl.scl(4f);
font.setColor(Color.lightGray);
for(int i = 0; i < values.length; i++){
float cy = y + fh, cx = x + graphW / (values.length - 1) * i + offsetX;
float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
Lines.line(cx, cy, cx, cy + len);
if(i == values.length/2){
font.draw("" + (i + from + 1), cx, cy - 2f, Align.center);
font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
}
}
font.setColor(Color.white);

4
core/src/mindustry/entities/comp/WaterMoveComp.java
View File

@ -19,7 +19,7 @@ import static mindustry.Vars.*;
@Component
abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
@Import float x, y, rotation;
@Import float x, y, rotation, speedMultiplier;
@Import UnitType type;
private transient Trail tleft = new Trail(1), tright = new Trail(1);
@ -74,7 +74,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
@Replace
public float floorSpeedMultiplier(){
Floor on = isFlying() ? Blocks.air.asFloor() : floorOn();
return on.isDeep() ? 1.3f : 1f;
return (on.isDeep() ? 1.3f : 1f) * speedMultiplier;
}
public boolean onLiquid(){

2
servers_v7.json
View File

@ -36,7 +36,7 @@
},
{
"name": "XCore",
"address": "178.170.47.34:28110"
"address": ["35.202.253.94" , "35.202.253.94:2000"]
},
{
"name": "Obvilion Network",