mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-06 16:27:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-09-05 12:07:20 -04:00
parent fb74dfa02f 461d87dbef
commit e35d09fe62
2 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,8 +38,14 @@ public class WaveGraph extends Table{
lay.setText(font, "1"); lay.setText(font, "1");
int maxY = switch(mode){
case counts -> nextStep(max);
case health -> nextStep((int)maxHealth);
case totals -> nextStep(maxTotal);
};
float fh = lay.height; float fh = lay.height;
float offsetX = Scl.scl(30f), offsetY = Scl.scl(22f) + fh + Scl.scl(5f); float offsetX = Scl.scl(lay.width * (maxY + "").length() * 2), offsetY = Scl.scl(22f) + fh + Scl.scl(5f);
float graphX = x + offsetX, graphY = y + offsetY, graphW = width - offsetX, graphH = height - offsetY; float graphX = x + offsetX, graphY = y + offsetY, graphW = width - offsetX, graphH = height - offsetY;
float spacing = graphW / (values.length - 1); float spacing = graphW / (values.length - 1);
@ -53,7 +59,7 @@ public class WaveGraph extends Table{
for(int i = 0; i < values.length; i++){ for(int i = 0; i < values.length; i++){
int val = values[i][type.id]; int val = values[i][type.id];
float cx = graphX + i*spacing, cy = graphY + val * graphH / max; float cx = graphX + i * spacing, cy = graphY + val * graphH / maxY;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -69,7 +75,7 @@ public class WaveGraph extends Table{
sum += values[i][type.id]; sum += values[i][type.id];
} }
float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxTotal; float cx = graphX + i * spacing, cy = graphY + sum * graphH / maxY;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -84,7 +90,7 @@ public class WaveGraph extends Table{
sum += (type.health) * values[i][type.id]; sum += (type.health) * values[i][type.id];
} }
float cx = graphX + i*spacing, cy = graphY + sum * graphH / maxHealth; float cx = graphX + i * spacing, cy = graphY + sum * graphH / maxY;
Lines.linePoint(cx, cy); Lines.linePoint(cx, cy);
} }
@ -92,19 +98,23 @@ public class WaveGraph extends Table{
} }
//how many numbers can fit here //how many numbers can fit here
float totalMarks = (graphH - getMarginBottom() *2f) / (lay.height * 2); float totalMarks = Mathf.clamp(maxY, 1, 10);
int markSpace = Math.max(1, Mathf.ceil(max / totalMarks)); int markSpace = Math.max(1, Mathf.ceil(maxY / totalMarks));
Draw.color(Color.lightGray); Draw.color(Color.lightGray);
for(int i = 0; i < max; i += markSpace){ Draw.alpha(0.1f);
float cy = graphY + i * graphH / max, cx = graphX;
//Lines.line(cx, cy, cx + len, cy); for(int i = 0; i < maxY; i += markSpace){
float cy = graphY + i * graphH / maxY, cx = graphX;
Lines.line(cx, cy, cx + graphW, cy);
lay.setText(font, "" + i); lay.setText(font, "" + i);
font.draw("" + i, cx, cy + lay.height/2f, Align.right); font.draw("" + i, cx, cy + lay.height / 2f, Align.right);
} }
Draw.alpha(1f);
float len = Scl.scl(4f); float len = Scl.scl(4f);
font.setColor(Color.lightGray); font.setColor(Color.lightGray);
@ -113,7 +123,7 @@ public class WaveGraph extends Table{
float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i; float cy = y + fh, cx = graphX + graphW / (values.length - 1) * i;
Lines.line(cx, cy, cx, cy + len); Lines.line(cx, cy, cx, cy + len);
if(i == values.length/2){ if(i == values.length / 2){
font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center); font.draw("" + (i + from + 1), cx, cy - Scl.scl(2f), Align.center);
} }
} }
@ -164,7 +174,7 @@ public class WaveGraph extends Table{
sum += spawned; sum += spawned;
} }
maxTotal = Math.max(maxTotal, sum); maxTotal = Math.max(maxTotal, sum);
maxHealth = Math.max(maxHealth,healthsum); maxHealth = Math.max(maxHealth, healthsum);
} }
ObjectSet<UnitType> usedCopy = new ObjectSet<>(used); ObjectSet<UnitType> usedCopy = new ObjectSet<>(used);
@ -200,6 +210,23 @@ public class WaveGraph extends Table{
return Tmp.c1.fromHsv(type.id / (float)Vars.content.units().size * 360f, 0.7f, 1f); return Tmp.c1.fromHsv(type.id / (float)Vars.content.units().size * 360f, 0.7f, 1f);
} }
int nextStep(float value){
int order = 1;
while(order < value){
if(order * 2 > value){
return order * 2;
}
if(order * 5 > value){
return order * 5;
}
if(order * 10 > value){
return order * 10;
}
order *= 10;
}
return order;
}
enum Mode{ enum Mode{
counts, totals, health; counts, totals, health;

8
servers_v6.json
View File

@ -104,11 +104,15 @@
"address": ["usfr2.forcehost.net:25578"] "address": ["usfr2.forcehost.net:25578"]
}, },
{ {
"name": "Español", "name": "Español",
"address": ["168.119.36.188:41445"] "address": ["168.119.36.188:41445"]
}, },
{ {
"name": "CreateDustry", "name": "CreateDustry",
"address": ["144.76.120.74:18645"] "address": ["144.76.120.74:18645"]
},
{
"name": "HexedPvP",
"address": ["001.finland.eu.hosts.dynamichost.xyz:23664"]
} }
] ]