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
2022-05-10 10:17:43 -04:00
parent ca67b0f43c
commit 85d7f2cd62
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,8 +550,12 @@ public class Renderer implements ApplicationListener{
drawThrusters(block, x, y, rotation, thrusterFrame); drawThrusters(block, x, y, rotation, thrusterFrame);
Draw.alpha(1f); Draw.alpha(1f);
if(block.teamRegions[build.team.id] == block.teamRegion) Draw.color(build.team.color);
Drawf.spinSprite(block.teamRegions[build.team.id], x, y, rotation); Drawf.spinSprite(block.teamRegions[build.team.id], x, y, rotation);
Draw.color();
Draw.scl(); Draw.scl();
Draw.reset(); Draw.reset();

12
core/src/mindustry/game/SectorInfo.java
View File

@@ -134,12 +134,12 @@ public class SectorInfo{
} }
//if there are infinite waves and no win wave, add a win wave. //if there are infinite waves and no win wave, add a win wave.
if(winWave <= 0 && !attack){ if(winWave <= 0 && !attack && state.rules.sector.planet.allowWaves){
if(state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.captureWave > 0){ winWave = 30;
winWave = state.rules.sector.preset.captureWave; }
}else{
winWave = 30; if(state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.captureWave > 0){
} winWave = state.rules.sector.preset.captureWave;
} }
state.wave = wave; state.wave = wave;

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -116,7 +116,7 @@ public class ImpactReactor extends PowerGenerator{
Draw.blend(Blending.additive); Draw.blend(Blending.additive);
for(int i = 0; i < plasmaRegions.length; i++){ for(int i = 0; i < plasmaRegions.length; i++){
float r = size * tilesize - 3f + Mathf.absin(Time.time, 2f + i * 1f, 5f - i * 0.5f); float r = ((float)plasmaRegions[i].width * Draw.scl - 3f + Mathf.absin(Time.time, 2f + i * 1f, 5f - i * 0.5f));
Draw.color(plasma1, plasma2, (float)i / plasmaRegions.length); Draw.color(plasma1, plasma2, (float)i / plasmaRegions.length);
Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * warmup); Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * warmup);