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

asfehioafuhioaghuoytgfctyr

Browse Source
This commit is contained in:
Anuken
2020-11-02 20:54:39 -05:00
parent 65ab869468
commit 5d2e705923
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -466,6 +466,8 @@ load = Load
save = Save save = Save
fps = FPS: {0} fps = FPS: {0}
ping = Ping: {0}ms ping = Ping: {0}ms
memory = Mem: {0}mb
memory2 = Mem:\n {0}mb +\n {1}mb
language.restart = Restart your game for the language settings to take effect. language.restart = Restart your game for the language settings to take effect.
settings = Settings settings = Settings
tutorial = Tutorial tutorial = Tutorial

2
core/src/mindustry/content/Blocks.java
View File

@@ -1774,7 +1774,7 @@ public class Blocks implements ContentList{
reloadTime = 6f; reloadTime = 6f;
coolantMultiplier = 0.5f; coolantMultiplier = 0.5f;
restitution = 0.1f; restitution = 0.1f;
ammoUseEffect = Fx.casing3Double; ammoUseEffect = Fx.casing3;
range = 200f; range = 200f;
inaccuracy = 3f; inaccuracy = 3f;
recoilAmount = 3f; recoilAmount = 3f;

4
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -162,14 +162,14 @@ public abstract class BulletType extends Content{
} }
public void hitTile(Bullet b, Building tile, float initialHealth){ public void hitTile(Bullet b, Building tile, float initialHealth){
if(makeFire){ if(makeFire && tile.team != b.team){
Fires.create(tile.tile); Fires.create(tile.tile);
} }
if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){ if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){
Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal); Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal);
tile.heal(healPercent / 100f * tile.maxHealth()); tile.heal(healPercent / 100f * tile.maxHealth());
}else{ }else if(tile.team != b.team){
hit(b); hit(b);
} }
} }

18
core/src/mindustry/ui/fragments/HudFragment.java
View File

@@ -247,12 +247,22 @@ public class HudFragment extends Fragment{
info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0)); info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0));
IntFormat fps = new IntFormat("fps"); IntFormat fps = new IntFormat("fps");
IntFormat ping = new IntFormat("ping"); IntFormat ping = new IntFormat("ping");
IntFormat mem = new IntFormat("memory");
IntFormat memnative = new IntFormat("memory2");
info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left() info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left().style(Styles.outlineLabel).name("fps");
.style(Styles.outlineLabel).name("fps");
info.row(); info.row();
info.label(() -> ping.get(netClient.getPing())).visible(net::client).left()
.style(Styles.outlineLabel).name("ping"); if(android){
info.label(() -> memnative.get((int)(Core.app.getJavaHeap() / 1024 / 1024), (int)(Core.app.getNativeHeap() / 1024 / 1024))).left().style(Styles.outlineLabel).name("memory2");
info.row();
}else{
info.label(() -> mem.get((int)(Core.app.getJavaHeap() / 1024 / 1024))).left().style(Styles.outlineLabel).name("memory");
info.row();
}
info.label(() -> ping.get(netClient.getPing())).visible(net::client).left().style(Styles.outlineLabel).name("ping");
}).top().left(); }).top().left();
}); });