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

Removed destruction delay when core is destroyed

Browse Source
This commit is contained in:
Anuken
2022-04-26 09:41:25 -04:00
parent f6e0c0ce11
commit 8f5b3ee1e0
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bloomshaders/alpha_bloom.frag
View File

@@ -11,5 +11,5 @@ void main(){
original = original * (vec4(1.0) - bloom); original = original * (vec4(1.0) - bloom);
vec4 combined = original + bloom; vec4 combined = original + bloom;
float mx = min(max(combined.r,max(combined.g,combined.b)), 1.0); float mx = min(max(combined.r,max(combined.g,combined.b)), 1.0);
gl_FragColor = vec4(combined.rgb/mx,mx); gl_FragColor = vec4(combined.rgb / mx, mx);
} }

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

@@ -2701,7 +2701,7 @@ public class Blocks{
incinerateNonBuildable = true; incinerateNonBuildable = true;
//TODO should this be higher? //TODO should this be higher?
buildCostMultiplier = 0.75f; buildCostMultiplier = 0.7f;
unitCapModifier = 15; unitCapModifier = 15;
researchCostMultiplier = 0.07f; researchCostMultiplier = 0.07f;

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

@@ -3647,7 +3647,7 @@ public class UnitTypes{
flying = true; flying = true;
mineSpeed = 4f; mineSpeed = 4f;
mineTier = 3; mineTier = 3;
buildSpeed = 0.8f; buildSpeed = 1.2f;
drag = 0.08f; drag = 0.08f;
speed = 5.6f; speed = 5.6f;
rotateSpeed = 7f; rotateSpeed = 7f;
@@ -3708,7 +3708,7 @@ public class UnitTypes{
flying = true; flying = true;
mineSpeed = 4.5f; mineSpeed = 4.5f;
mineTier = 3; mineTier = 3;
buildSpeed = 1.1f; buildSpeed = 1.4f;
drag = 0.08f; drag = 0.08f;
speed = 7f; speed = 7f;
rotateSpeed = 8f; rotateSpeed = 8f;
@@ -3782,7 +3782,7 @@ public class UnitTypes{
flying = true; flying = true;
mineSpeed = 5f; mineSpeed = 5f;
mineTier = 3; mineTier = 3;
buildSpeed = 1.4f; buildSpeed = 1.5f;
drag = 0.08f; drag = 0.08f;
speed = 7.5f; speed = 7.5f;
rotateSpeed = 8f; rotateSpeed = 8f;

3
core/src/mindustry/game/Teams.java
View File

@@ -329,7 +329,8 @@ public class Teams{
for(var build : builds){ for(var build : builds){
if(build.within(x, y, range) && !cores.contains(c -> c.within(x, y, range))){ if(build.within(x, y, range) && !cores.contains(c -> c.within(x, y, range))){
Time.run(Mathf.random(0f, 60f * 6f), build::kill); build.kill();
//Time.run(Mathf.random(0f, 60f * 6f), build::kill);
} }
} }
} }