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

Minor cleanup / Another slight vela buff

Browse Source
This commit is contained in:
Anuken
2021-03-08 17:12:53 -05:00
parent e1b0e07f3c
commit 25c61590d1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,7 +411,7 @@ public class UnitTypes implements ContentList{
mechStepShake = 0.15f; mechStepShake = 0.15f;
ammoType = AmmoTypes.powerHigh; ammoType = AmmoTypes.powerHigh;
speed = 0.38f; speed = 0.39f;
boostMultiplier = 2.2f; boostMultiplier = 2.2f;
engineOffset = 12f; engineOffset = 12f;
engineSize = 6f; engineSize = 6f;
@@ -442,7 +442,7 @@ public class UnitTypes implements ContentList{
cooldownTime = 200f; cooldownTime = 200f;
bullet = new ContinuousLaserBulletType(){{ bullet = new ContinuousLaserBulletType(){{
damage = 28f; damage = 30f;
length = 175f; length = 175f;
hitEffect = Fx.hitMeltHeal; hitEffect = Fx.hitMeltHeal;
drawSize = 420f; drawSize = 420f;
@@ -453,7 +453,7 @@ public class UnitTypes implements ContentList{
shootEffect = Fx.greenLaserChargeSmall; shootEffect = Fx.greenLaserChargeSmall;
incendChance = 0.09f; incendChance = 0.1f;
incendSpread = 5f; incendSpread = 5f;
incendAmount = 1; incendAmount = 1;

7
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -28,6 +28,7 @@ import mindustry.world.blocks.environment.*;
import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
import static mindustry.logic.GlobalConstants.*;
@Component(base = true) @Component(base = true)
abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc, Builderc{ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc, Builderc{
@@ -140,9 +141,9 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case mineY -> mining() ? mineTile.y : -1; case mineY -> mining() ? mineTile.y : -1;
case flag -> flag; case flag -> flag;
case controlled -> !isValid() ? 0 : case controlled -> !isValid() ? 0 :
controller instanceof LogicAI ? GlobalConstants.ctrlProcessor : controller instanceof LogicAI ? ctrlProcessor :
controller instanceof Player ? GlobalConstants.ctrlPlayer : controller instanceof Player ? ctrlPlayer :
controller instanceof FormationAI ? GlobalConstants.ctrlFormation : controller instanceof FormationAI ? ctrlFormation :
0; 0;
case commanded -> controller instanceof FormationAI && isValid() ? 1 : 0; case commanded -> controller instanceof FormationAI && isValid() ? 1 : 0;
case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0; case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;

1
core/src/mindustry/ui/Fonts.java
View File

@@ -117,7 +117,6 @@ public class Fonts{
if(region.texture != uitex){ if(region.texture != uitex){
continue; continue;
//throw new IllegalArgumentException("Font icon '" + texture + "' is not in the UI texture.");
} }
unicodeIcons.put(nametex[0], ch); unicodeIcons.put(nametex[0], ch);