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

Fixed #3656

Browse Source
This commit is contained in:
Anuken
2020-11-29 16:34:31 -05:00
parent 2a9f362e15
commit a7c18fc598
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1657,6 +1657,7 @@ public class UnitTypes implements ContentList{
recoil = 3f;
occlusion = 12f;
ejectEffect = Fx.casing3;
shootSound = Sounds.shootBig;
shots = 3;
shotDelay = 4f;

2
core/src/mindustry/core/Control.java
View File

@@ -340,7 +340,7 @@ public class Control implements ApplicationListener, Loadable{
state.rules.waves = true;
//reset win wave??
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : 40;
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40;
//if there's still an enemy base left, fix it
if(state.rules.attackMode){

2
core/src/mindustry/game/Universe.java
View File

@@ -225,9 +225,11 @@ public class Universe{
if(sector.isBeingPlayed()){
state.rules.winWave = waveMax;
state.rules.waves = true;
state.rules.attackMode = false;
}else{
sector.info.winWave = waveMax;
sector.info.waves = true;
sector.info.attack = false;
sector.saveInfo();
}