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

Repair speed improvements

Browse Source
This commit is contained in:
Anuken
2022-03-02 22:16:30 -05:00
parent 7865950ec8
commit bd320e39ed
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/aware.msav
View File

Binary file not shown.

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

@@ -68,7 +68,7 @@ public class Planets{
r.attributes.set(Attribute.heat, 0.8f); r.attributes.set(Attribute.heat, 0.8f);
r.showSpawns = true; r.showSpawns = true;
r.fog = true; r.fog = true;
r.staticFog = true; //TODO false r.staticFog = false; //TODO decide
}; };
unlockedOnLand.add(Blocks.coreBastion); unlockedOnLand.add(Blocks.coreBastion);

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

@@ -3412,10 +3412,10 @@ public class UnitTypes{
rotate = false; rotate = false;
shootY = 0f; shootY = 0f;
beamWidth = 0.7f; beamWidth = 0.7f;
repairSpeed = 0.25f; repairSpeed = 2.2f;
fractionRepairSpeed = 0.04f;
aimDst = 0f; aimDst = 0f;
shootCone = 15f; shootCone = 15f;
fractionRepair = true;
mirror = false; mirror = false;
targetUnits = false; targetUnits = false;
@@ -3473,12 +3473,13 @@ public class UnitTypes{
rotate = false; rotate = false;
shootY = 0f; shootY = 0f;
beamWidth = 0.7f; beamWidth = 0.7f;
repairSpeed = 0.3f;
aimDst = 0f; aimDst = 0f;
shootCone = 15f; shootCone = 15f;
fractionRepair = true;
mirror = false; mirror = false;
repairSpeed = 2.5f;
fractionRepairSpeed = 0.04f;
targetUnits = false; targetUnits = false;
targetBuildings = true; targetBuildings = true;
autoTarget = false; autoTarget = false;
@@ -3547,12 +3548,13 @@ public class UnitTypes{
rotate = false; rotate = false;
shootY = 0f; shootY = 0f;
beamWidth = 0.7f; beamWidth = 0.7f;
repairSpeed = 0.2f;
aimDst = 0f; aimDst = 0f;
shootCone = 40f; shootCone = 40f;
fractionRepair = true;
mirror = true; mirror = true;
repairSpeed = 1.3f;
fractionRepairSpeed = 0.02f;
targetUnits = false; targetUnits = false;
targetBuildings = true; targetBuildings = true;
autoTarget = false; autoTarget = false;

9
core/src/mindustry/type/weapons/RepairBeamWeapon.java
View File

@@ -26,10 +26,9 @@ import static mindustry.Vars.*;
* */ * */
public class RepairBeamWeapon extends Weapon{ public class RepairBeamWeapon extends Weapon{
public boolean targetBuildings = false, targetUnits = true; public boolean targetBuildings = false, targetUnits = true;
//TODO leads to wrong stats
public boolean fractionRepair = false;
public float repairSpeed = 0.3f; public float repairSpeed = 0.3f;
public float fractionRepairSpeed = 0f;
public float beamWidth = 1f; public float beamWidth = 1f;
public float pulseRadius = 6f; public float pulseRadius = 6f;
public float pulseStroke = 2f; public float pulseStroke = 2f;
@@ -150,7 +149,7 @@ public class RepairBeamWeapon extends Weapon{
} }
if(canShoot && mount.target instanceof Healthc u){ if(canShoot && mount.target instanceof Healthc u){
u.heal(repairSpeed * heal.strength * Time.delta * (fractionRepair ? u.maxHealth() / 100f : 1f)); u.heal(repairSpeed * heal.strength * Time.delta + fractionRepairSpeed * heal.strength * Time.delta * u.maxHealth() / 100f);
} }
} }
@@ -174,9 +173,7 @@ public class RepairBeamWeapon extends Weapon{
@Override @Override
public void init(){ public void init(){
if(fractionRepair){ bullet.healPercent = fractionRepairSpeed;
bullet.healPercent = repairSpeed;
}
} }
public static class HealBeamMount extends WeaponMount{ public static class HealBeamMount extends WeaponMount{

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=d630626387 archash=1eed4e223d