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

Crash fix / tilesSecond speed unit

Browse Source
This commit is contained in:
Anuken
2021-07-01 11:17:42 -04:00
parent 2ea1671739
commit ec59cb602c
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@@ -806,6 +806,7 @@ bullet.reload = [stat]{0}[lightgray]x fire rate
unit.blocks = blocks unit.blocks = blocks
unit.blockssquared = blocks² unit.blockssquared = blocks²
unit.powersecond = power units/second unit.powersecond = power units/second
unit.tilessecond = tiles/second
unit.liquidsecond = liquid units/second unit.liquidsecond = liquid units/second
unit.itemssecond = items/second unit.itemssecond = items/second
unit.liquidunits = liquid units unit.liquidunits = liquid units

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

@@ -1978,25 +1978,25 @@ public class Blocks implements ContentList{
}}; }};
repairPoint = new RepairPoint("repair-point"){{ repairPoint = new RepairPoint("repair-point"){{
requirements(Category.units, with(Items.lead, 25, Items.copper, 25, Items.silicon, 20)); requirements(Category.units, with(Items.lead, 30, Items.copper, 30, Items.silicon, 20));
repairSpeed = 0.5f; repairSpeed = 0.45f;
repairRadius = 65f; repairRadius = 60f;
beamWidth = 0.73f; beamWidth = 0.73f;
powerUse = 1f; powerUse = 1f;
pulseRadius = 5f; pulseRadius = 5f;
}}; }};
repairTurret = new RepairPoint("repair-turret"){{ repairTurret = new RepairPoint("repair-turret"){{
requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 80)); requirements(Category.units, with(Items.silicon, 90, Items.thorium, 80, Items.plastanium, 60));
size = 2; size = 2;
length = 6f; length = 6f;
repairSpeed = 3f; repairSpeed = 3f;
repairRadius = 140f; repairRadius = 145f;
powerUse = 5f; powerUse = 5f;
beamWidth = 1.1f; beamWidth = 1.1f;
pulseRadius = 6.1f; pulseRadius = 6.1f;
coolantUse = 0.16f; coolantUse = 0.16f;
coolantMultiplier = 1.5f; coolantMultiplier = 1.6f;
acceptCoolant = true; acceptCoolant = true;
}}; }};

2
core/src/mindustry/type/UnitType.java
View File

@@ -255,7 +255,7 @@ public class UnitType extends UnlockableContent{
stats.add(Stat.health, health); stats.add(Stat.health, health);
stats.add(Stat.armor, armor); stats.add(Stat.armor, armor);
stats.add(Stat.speed, speed); stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond);
stats.add(Stat.size, hitSize / tilesize, StatUnit.blocksSquared); stats.add(Stat.size, hitSize / tilesize, StatUnit.blocksSquared);
stats.add(Stat.itemCapacity, itemCapacity); stats.add(Stat.itemCapacity, itemCapacity);
stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks); stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks);

2
core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
View File

@@ -75,7 +75,7 @@ public class PayloadConveyor extends Block{
@Override @Override
public boolean canControlSelect(Player player){ public boolean canControlSelect(Player player){
return this.item == null && !player.unit().spawnedByCore && player.unit().hitSize / tilesize <= payloadLimit && player.tileOn().build == this; return this.item == null && !player.unit().spawnedByCore && player.unit().hitSize / tilesize <= payloadLimit && player.tileOn() != null && player.tileOn().build == this;
} }
@Override @Override

1
core/src/mindustry/world/meta/StatUnit.java
View File

@@ -10,6 +10,7 @@ import java.util.*;
public enum StatUnit{ public enum StatUnit{
blocks, blocks,
blocksSquared, blocksSquared,
tilesSecond,
powerSecond, powerSecond,
liquidSecond, liquidSecond,
itemsSecond, itemsSecond,

2
desktop/src/mindustry/desktop/steam/SNet.java
View File

@@ -305,7 +305,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
@Override @Override
public void onLobbyMatchList(int matches){ public void onLobbyMatchList(int matches){
Log.info("found @ matches @", matches, lobbyDoneCallback); Log.info("found @ matches", matches);
if(lobbyDoneCallback != null){ if(lobbyDoneCallback != null){
Seq<Host> hosts = new Seq<>(); Seq<Host> hosts = new Seq<>();