Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added turk bundle, updated wrapping, added fastshoot kick message

Browse Source
This commit is contained in:
Anuken
2018-05-05 13:45:04 -04:00
parent c1163a078a
commit b496f51afc
6 changed files with 563 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -177,8 +177,8 @@ public class NetServer extends Module{
if(!Timers.get("fastshoot-" + id + "-" + weapon.id, wtrc)){
info.fastShots.getAndIncrement(weapon.id, 0, 1);
if(info.fastShots.get(weapon.id, 0) > (int)(wtrc / (weapon.getReload() / 2f)) + 8){
kick(id, KickReason.kick);
if(info.fastShots.get(weapon.id, 0) > (int)(wtrc / (weapon.getReload() / 2f)) + 30){
kick(id, KickReason.fastShoot);
}
}else{
info.fastShots.put(weapon.id, 0);
@@ -279,6 +279,7 @@ public class NetServer extends Module{
});
Net.handleServer(EntityRequestPacket.class, (cid, packet) -> {
int id = packet.id;
int dest = cid;
EntityGroup group = Entities.getGroup(packet.group);

2
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -377,7 +377,7 @@ public class Packets {
}
public enum KickReason{
kick, invalidPassword, clientOutdated, serverOutdated, banned, gameover(true), recentKick;
kick, invalidPassword, clientOutdated, serverOutdated, banned, gameover(true), recentKick, fastShoot;
public final boolean quiet;
KickReason(){ quiet = false; }

2
core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
View File

@@ -101,7 +101,7 @@ public class LevelDialog extends FloatingDialog{
Table inset = new Table("pane-button");
inset.add("[accent]" + Bundles.get("map."+map.name+".name", map.name)).pad(3f);
inset.row();
inset.label((() -> Bundles.format("text.level.highscore", Settings.getInt("hiscore" + map.name, 0)))).pad(3f)
inset.label((() -> Bundles.format("text.level.highscore", Settings.getInt("hiscore" + map.name, 0)))).pad(3f).padLeft(-2).padRight(-2)
.wrap().growX().get().setAlignment(Align.center, Align.left);
inset.pack();