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

the obligatory daily commit

Browse Source
This commit is contained in:
Anuken
2021-12-17 17:55:03 -05:00
parent e481de9d28
commit 3866a9a8e7
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1598,7 +1598,7 @@ block.silicon-crucible.description = Refines silicon from sand and coal, using p
block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium. block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate. block.overdrive-dome.description = Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
block.payload-conveyor.description = Moves large payloads, such as units from factories. Magnetic. Usable in zero-G environments. block.payload-conveyor.description = Moves large payloads, such as units from factories. Magnetic. Usable in zero-G environments.
block.payload-router.description = Splits input payloads into 3 output directions. Magnetic. Usable in zero-G environments. block.payload-router.description = Splits input payloads into 3 output directions. Functions as a sorter when a filter is set. Magnetic. Usable in zero-G environments.
block.command-center.description = Controls unit behavior with several different commands. block.command-center.description = Controls unit behavior with several different commands.
block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading. block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading. block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.

2
core/src/mindustry/core/Logic.java
View File

@@ -97,7 +97,7 @@ public class Logic implements ApplicationListener{
Events.on(PlayEvent.class, e -> { Events.on(PlayEvent.class, e -> {
//reset weather on play //reset weather on play
var randomWeather = state.rules.weather.copy().shuffle(); var randomWeather = state.rules.weather.copy().shuffled();
float sum = 0f; float sum = 0f;
for(var weather : randomWeather){ for(var weather : randomWeather){
weather.cooldown = sum + Mathf.random(weather.maxFrequency); weather.cooldown = sum + Mathf.random(weather.maxFrequency);

3
core/src/mindustry/world/blocks/payloads/PayloadRouter.java
View File

@@ -29,6 +29,7 @@ public class PayloadRouter extends PayloadConveyor{
outputsPayload = true; outputsPayload = true;
outputFacing = false; outputFacing = false;
configurable = true; configurable = true;
clearOnDoubleTap = true;
config(Block.class, (PayloadRouterBuild tile, Block item) -> tile.sorted = item); config(Block.class, (PayloadRouterBuild tile, Block item) -> tile.sorted = item);
config(UnitType.class, (PayloadRouterBuild tile, UnitType item) -> tile.sorted = item); config(UnitType.class, (PayloadRouterBuild tile, UnitType item) -> tile.sorted = item);
@@ -163,8 +164,6 @@ public class PayloadRouter extends PayloadConveyor{
if(item != null){ if(item != null){
item.draw(); item.draw();
} }
//TODO draw sort item
} }
@Override @Override

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=de5a78a868 archash=487418bc46