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

Support for team-specific multipliers (no UI)

Browse Source
This commit is contained in:
Anuken
2021-08-11 21:18:48 -04:00
parent 4fc18d35ce
commit 0cac972061
7 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -197,7 +197,7 @@ public class Reconstructor extends UnitBlock{
if(moveInPayload()){
if(consValid()){
valid = true;
progress += edelta() * state.rules.unitBuildSpeedMultiplier;
progress += edelta() * state.rules.unitBuildSpeed(team);
}
//upgrade the unit
@@ -214,7 +214,7 @@ public class Reconstructor extends UnitBlock{
}
speedScl = Mathf.lerpDelta(speedScl, Mathf.num(valid), 0.05f);
time += edelta() * speedScl * state.rules.unitBuildSpeedMultiplier;
time += edelta() * speedScl * state.rules.unitBuildSpeed(team);
}
@Override

4
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -213,8 +213,8 @@ public class UnitFactory extends UnitBlock{
}
if(consValid() && currentPlan != -1){
time += edelta() * speedScl * Vars.state.rules.unitBuildSpeedMultiplier;
progress += edelta() * Vars.state.rules.unitBuildSpeedMultiplier;
time += edelta() * speedScl * Vars.state.rules.unitBuildSpeed(team);
progress += edelta() * Vars.state.rules.unitBuildSpeed(team);
speedScl = Mathf.lerpDelta(speedScl, 1f, 0.05f);
}else{
speedScl = Mathf.lerpDelta(speedScl, 0f, 0.05f);