Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anuken
Anuken committed Jul 23, 2023
2 parents 135874b + 09aa68f commit e78fb11
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 31 deletions.
4 changes: 2 additions & 2 deletions core/src/mindustry/entities/part/HoverPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
public class HoverPart extends DrawPart{
public float radius = 4f;
public float x, y, rotation, phase = 50f, stroke = 3f, minStroke = 0.12f;
public int circles = 2;
public int circles = 2, sides = 4;
public Color color = Color.white;
public boolean mirror = false;
public float layer = -1f, layerOffset = 0f;
Expand Down Expand Up @@ -40,7 +40,7 @@ public void draw(PartParams params){
rx = params.x + Tmp.v1.x,
ry = params.y + Tmp.v1.y;

Lines.square(rx, ry, radius * fin, params.rotation - 45f);
Lines.poly(rx, ry, sides, radius * fin, params.rotation);
}
}

Expand Down
51 changes: 27 additions & 24 deletions core/src/mindustry/ui/fragments/PlayerListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,33 +196,36 @@ public void draw(){
}).row();
}

t.button("@player.team", Icon.redo, bstyle, () -> {
var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name);
teamSelect.setFillParent(false);

var group = new ButtonGroup<>();

int i = 0;

for(Team team : Team.baseTeams){
var b = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
b.margin(4f);
b.getImageCell().grow();
b.getStyle().imageUpColor = team.color;
b.clicked(() -> {
Call.adminRequest(user, AdminAction.switchTeam, team);
teamSelect.hide();
});
teamSelect.cont.add(b).size(50f).checked(a -> user.team() == team).group(group);
//there's generally no reason to team switch outside PvP or sandbox, and it's basically an easy way to cheat
if(state.rules.pvp || state.rules.infiniteResources){
t.button("@player.team", Icon.redo, bstyle, () -> {
var teamSelect = new BaseDialog(Core.bundle.get("player.team") + ": " + user.name);
teamSelect.setFillParent(false);

var group = new ButtonGroup<>();

int i = 0;

for(Team team : Team.baseTeams){
var b = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);
b.margin(4f);
b.getImageCell().grow();
b.getStyle().imageUpColor = team.color;
b.clicked(() -> {
Call.adminRequest(user, AdminAction.switchTeam, team);
teamSelect.hide();
});
teamSelect.cont.add(b).size(50f).checked(a -> user.team() == team).group(group);

if(i++ % 3 == 2) teamSelect.cont.row();
}
if(i++ % 3 == 2) teamSelect.cont.row();
}

teamSelect.addCloseButton();
teamSelect.show();
teamSelect.addCloseButton();
teamSelect.show();

dialog.hide();
}).row();
dialog.hide();
}).row();
}

if(!net.client() && !user.isLocal()){
t.button("@player.admin", Icon.admin, Styles.togglet, () -> {
Expand Down
14 changes: 9 additions & 5 deletions servers_v7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"name": "thedimas",
"address": ["91.209.226.11", "91.209.226.11:6503","91.209.226.11:6505", "91.209.226.11:6506", "91.209.226.11:6507", "91.209.226.11:6508", "91.209.226.11:6509", "91.209.226.11:6510", "91.209.226.11:6511", "91.209.226.11:6512", "91.209.226.11:6513"]
"address": ["167.86.69.235", "167.86.69.235:6503","167.86.69.235:6505", "167.86.69.235:6506", "167.86.69.235:6507", "167.86.69.235:6508", "167.86.69.235:6509", "167.86.69.235:6510", "167.86.69.235:6511", "167.86.69.235:6512", "167.86.69.235:6513"]
},
{
"name": "HexPvP Network",
Expand All @@ -57,7 +57,7 @@
},
{
"name": "Darkdustry",
"address": ["128.140.88.66:3000", "128.140.88.66:3001", "128.140.88.66:3002", "128.140.88.66:3003", "128.140.88.66:3004", "128.140.88.66:3005", "128.140.88.66:3006", "128.140.88.66:3007", "128.140.88.66:3008", "128.140.88.66:3009", "128.140.88.66:3010"]
"address": ["130.61.78.82:3000", "130.61.78.82:3001", "130.61.78.82:3002", "130.61.78.82:3003", "130.61.78.82:3004", "130.61.78.82:3005", "130.61.78.82:3006", "130.61.78.82:3007", "130.61.78.82:3008", "130.61.78.82:3009", "130.61.78.82:3010"]
},
{
"name": "Chaotic Neutral",
Expand Down Expand Up @@ -97,15 +97,15 @@
},
{
"name": "OMNIDUSTRY",
"address": ["80.90.179.146", "80.90.179.146:6568", "80.90.179.146:6569", "80.90.179.146:6570", "80.90.179.146:6571", "80.90.179.146:6572", "80.90.179.146:6573", "80.90.179.146:6574"]
"address": ["109.94.209.233", "109.94.209.233:6568", "109.94.209.233:6569", "109.94.209.233:6570", "109.94.209.233:6571", "109.94.209.233:6572", "109.94.209.233:6573", "109.94.209.233:6574"]
},
{
"name": "The Devil",
"address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404"]
},
{
"name": "Eradicationdustry",
"address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.yeet.ml:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry2.mindustry.me:6567", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678"]
"name": "Eradication Mindustry",
"address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"]
},
{
"name": "Conservatory",
Expand Down Expand Up @@ -179,5 +179,9 @@
"name": "Official Mindustry Events",
"address": ["event.baseduser.eu.org"],
"prioritized": true
},
{
"name": "Four Family",
"address": ["118.127.8.162:25503"]
}
]

0 comments on commit e78fb11

Please sign in to comment.