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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-08-18 00:37:09 -04:00
parent 0bd122c570
commit 0b407c7c1f
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,7 @@ public class UnitTypes implements ContentList{
bullet = new LightningBulletType(){{ bullet = new LightningBulletType(){{
lightningColor = hitColor = Pal.heal; lightningColor = hitColor = Pal.heal;
damage = 11f; damage = 12f;
lightningLength = 7; lightningLength = 7;
lightningLengthRand = 7; lightningLengthRand = 7;
shootEffect = Fx.shootHeal; shootEffect = Fx.shootHeal;

4
core/src/mindustry/core/Logic.java
View File

@@ -331,7 +331,9 @@ public class Logic implements ApplicationListener{
} }
if(!state.isPaused()){ if(!state.isPaused()){
state.secinfo.update(); if(state.isCampaign()){
state.secinfo.update();
}
if(state.isCampaign()){ if(state.isCampaign()){
universe.update(); universe.update();

4
core/src/mindustry/core/UI.java
View File

@@ -286,6 +286,7 @@ public class UI implements ApplicationListener, Loadable{
public void showInfoFade(String info){ public void showInfoFade(String info){
Table table = new Table(); Table table = new Table();
table.touchable = Touchable.disabled;
table.setFillParent(true); table.setFillParent(true);
table.actions(Actions.fadeOut(7f, Interp.fade), Actions.remove()); table.actions(Actions.fadeOut(7f, Interp.fade), Actions.remove());
table.top().add(info).style(Styles.outlineLabel).padTop(10); table.top().add(info).style(Styles.outlineLabel).padTop(10);
@@ -481,10 +482,11 @@ public class UI implements ApplicationListener, Loadable{
public void announce(String text){ public void announce(String text){
Table t = new Table(); Table t = new Table();
t.touchable = Touchable.disabled;
t.background(Styles.black3).margin(8f) t.background(Styles.black3).margin(8f)
.add(text).style(Styles.outlineLabel); .add(text).style(Styles.outlineLabel);
t.update(() -> t.setPosition(Core.graphics.getWidth()/2f, Core.graphics.getHeight()/2f, Align.center)); t.update(() -> t.setPosition(Core.graphics.getWidth()/2f, Core.graphics.getHeight()/2f, Align.center));
t.actions(Actions.fadeOut(3, Interp.pow4In)); t.actions(Actions.fadeOut(3, Interp.pow4In), Actions.remove());
Core.scene.add(t); Core.scene.add(t);
} }

2
core/src/mindustry/input/MobileInput.java
View File

@@ -794,6 +794,8 @@ public class MobileInput extends InputHandler implements GestureListener{
Rect rect = Tmp.r3; Rect rect = Tmp.r3;
UnitType type = unit.type(); UnitType type = unit.type();
if(type == null) return;
boolean flying = type.flying; boolean flying = type.flying;
boolean omni = !(unit instanceof WaterMovec); boolean omni = !(unit instanceof WaterMovec);
boolean legs = unit.isGrounded(); boolean legs = unit.isGrounded();