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

Misc bugfixes

Browse Source
This commit is contained in:
Anuken
2025-04-05 10:48:07 -04:00
parent 519e9ba3e1
commit 95e663d1df
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1017,6 +1017,7 @@ public class UnitTypes{
engineOffset = 7.8f; engineOffset = 7.8f;
range = 140f; range = 140f;
faceTarget = false; faceTarget = false;
autoDropBombs = true;
armor = 3f; armor = 3f;
itemCapacity = 0; itemCapacity = 0;
targetFlags = new BlockFlag[]{BlockFlag.factory, null}; targetFlags = new BlockFlag[]{BlockFlag.factory, null};
@@ -1390,6 +1391,7 @@ public class UnitTypes{
drag = 0.017f; drag = 0.017f;
lowAltitude = false; lowAltitude = false;
flying = true; flying = true;
autoDropBombs = true;
circleTarget = true; circleTarget = true;
engineOffset = 13f; engineOffset = 13f;
engineSize = 7f; engineSize = 7f;
@@ -1908,6 +1910,7 @@ public class UnitTypes{
mixColorTo = Color.white; mixColorTo = Color.white;
hitSound = Sounds.plasmaboom; hitSound = Sounds.plasmaboom;
underwater = true;
ejectEffect = Fx.none; ejectEffect = Fx.none;
hitSize = 22f; hitSize = 22f;
@@ -3280,6 +3283,7 @@ public class UnitTypes{
}}); }});
weapons.add(new Weapon(){{ weapons.add(new Weapon(){{
shootSound = Sounds.none;
shootCone = 360f; shootCone = 360f;
mirror = false; mirror = false;
reload = 1f; reload = 1f;
@@ -3301,7 +3305,7 @@ public class UnitTypes{
tecta = new ErekirUnitType("tecta"){{ tecta = new ErekirUnitType("tecta"){{
drag = 0.1f; drag = 0.1f;
speed = 0.6f; speed = 0.6f;
hitSize = 23f; hitSize = 30f;
health = 7300; health = 7300;
armor = 5f; armor = 5f;
@@ -3576,6 +3580,7 @@ public class UnitTypes{
elude = new ErekirUnitType("elude"){{ elude = new ErekirUnitType("elude"){{
hovering = true; hovering = true;
canDrown = false;
shadowElevation = 0.1f; shadowElevation = 0.1f;
drag = 0.07f; drag = 0.07f;
@@ -3862,6 +3867,7 @@ public class UnitTypes{
loopSoundVolume = 0.1f; loopSoundVolume = 0.1f;
weapons.add(new Weapon(){{ weapons.add(new Weapon(){{
shootSound = Sounds.none;
shootCone = 360f; shootCone = 360f;
mirror = false; mirror = false;
reload = 1f; reload = 1f;

2
core/src/mindustry/entities/comp/TankComp.java
View File

@@ -66,7 +66,7 @@ abstract class TankComp implements Posc, Hitboxc, Unitc, ElevationMovec{
solids ++; solids ++;
} }
if(t.floor().isDeep()){ if(t != null && t.floor().isDeep()){
lastDeepFloor = t.floor(); lastDeepFloor = t.floor();
}else{ }else{
anyNonDeep = true; anyNonDeep = true;

3
core/src/mindustry/world/blocks/defense/RegenProjector.java
View File

@@ -134,6 +134,8 @@ public class RegenProjector extends Block{
return; return;
} }
anyTargets = targets.contains(b -> b.damaged());
if(efficiency > 0){ if(efficiency > 0){
if((optionalTimer += Time.delta * optionalEfficiency) >= optionalUseTime){ if((optionalTimer += Time.delta * optionalEfficiency) >= optionalUseTime){
consume(); consume();
@@ -147,7 +149,6 @@ public class RegenProjector extends Block{
if(!build.damaged() || build.isHealSuppressed()) continue; if(!build.damaged() || build.isHealSuppressed()) continue;
didRegen = true; didRegen = true;
anyTargets = true;
int pos = build.pos(); int pos = build.pos();
//TODO periodic effect //TODO periodic effect