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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-09-04 21:44:54 -04:00
parent e1759adcfe afc1ff58c5
commit a3d654389c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

3
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -30,6 +30,7 @@ public class Conveyor extends Block implements Autotiler{
public float speed = 0f; public float speed = 0f;
public float displayedSpeed = 0f; public float displayedSpeed = 0f;
public boolean pushUnits = true;
public @Nullable Block junctionReplacement, bridgeReplacement; public @Nullable Block junctionReplacement, bridgeReplacement;
@@ -223,7 +224,7 @@ public class Conveyor extends Block implements Autotiler{
@Override @Override
public void unitOn(Unit unit){ public void unitOn(Unit unit){
if(clogHeat > 0.5f || !enabled) return; if(!pushUnits || clogHeat > 0.5f || !enabled) return;
noSleep(); noSleep();

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

@@ -21,6 +21,7 @@ public class PayloadConveyor extends Block{
public @Load("@-edge") TextureRegion edgeRegion; public @Load("@-edge") TextureRegion edgeRegion;
public Interp interp = Interp.pow5; public Interp interp = Interp.pow5;
public float payloadLimit = 3f; public float payloadLimit = 3f;
public boolean pushUnits = true;
public PayloadConveyor(String name){ public PayloadConveyor(String name){
super(name); super(name);
@@ -257,7 +258,7 @@ public class PayloadConveyor extends Block{
@Override @Override
public void unitOn(Unit unit){ public void unitOn(Unit unit){
if(!enabled) return; if(!pushUnits || !enabled) return;
//calculate derivative of units moved last frame //calculate derivative of units moved last frame
float delta = (curInterp - lastInterp) * size * tilesize; float delta = (curInterp - lastInterp) * size * tilesize;

2
servers_v7.json
View File

@@ -262,7 +262,7 @@
}, },
{ {
"name": "Alex Multiverse", "name": "Alex Multiverse",
"address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820"] "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.8:1025", "181.215.58.8:1027", "181.215.58.7:1820", "23.95.107.12"]
}, },
{ {
"name": "Open PVP", "name": "Open PVP",