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

Don't show guardian warning when above win wave

Browse Source
This commit is contained in:
Anuken
2020-10-30 14:57:34 -04:00
parent ed93fa45d3
commit 28240f730f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,12 +174,14 @@ public class Blocks implements ContentList{
isLiquid = true; isLiquid = true;
cacheLayer = CacheLayer.water; cacheLayer = CacheLayer.water;
albedo = 0.5f; albedo = 0.5f;
attributes.set(Attribute.spores, 0.15f);
}}; }};
darksandTaintedWater = new ShallowLiquid("darksand-tainted-water"){{ darksandTaintedWater = new ShallowLiquid("darksand-tainted-water"){{
speedMultiplier = 0.75f; speedMultiplier = 0.75f;
statusDuration = 60f; statusDuration = 60f;
albedo = 0.5f; albedo = 0.5f;
attributes.set(Attribute.spores, 0.1f);
}}; }};
sandWater = new ShallowLiquid("sand-water"){{ sandWater = new ShallowLiquid("sand-water"){{

1
core/src/mindustry/content/Bullets.java
View File

@@ -280,6 +280,7 @@ public class Bullets implements ContentList{
splashDamage = 25f; splashDamage = 25f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
lightningDamage = 10;
lightning = 2; lightning = 2;
lightningLength = 10; lightningLength = 10;
}}; }};

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

@@ -51,8 +51,9 @@ public class HudFragment extends Fragment{
//warn about guardian/boss waves //warn about guardian/boss waves
Events.on(WaveEvent.class, e -> { Events.on(WaveEvent.class, e -> {
int max = 10; int max = 10;
int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
outer: outer:
for(int i = state.wave - 1; i <= state.wave + max; i++){ for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave); i++){
for(SpawnGroup group : state.rules.spawns){ for(SpawnGroup group : state.rules.spawns){
if(group.effect == StatusEffects.boss && group.getSpawned(i) > 0){ if(group.effect == StatusEffects.boss && group.getSpawned(i) > 0){
int diff = (i + 2) - state.wave; int diff = (i + 2) - state.wave;