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

Overdriveable bridges

Browse Source
This commit is contained in:
Anuken
2020-09-05 08:47:38 -04:00
parent 68f00a8983
commit 12f1ee9537
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1086,14 +1086,14 @@ public class Blocks implements ContentList{
powerNode = new PowerNode("power-node"){{ powerNode = new PowerNode("power-node"){{
requirements(Category.power, with(Items.copper, 1, Items.lead, 3)); requirements(Category.power, with(Items.copper, 1, Items.lead, 3));
maxNodes = 20; maxNodes = 10;
laserRange = 6; laserRange = 6;
}}; }};
powerNodeLarge = new PowerNode("power-node-large"){{ powerNodeLarge = new PowerNode("power-node-large"){{
requirements(Category.power, with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3)); requirements(Category.power, with(Items.titanium, 5, Items.lead, 10, Items.silicon, 3));
size = 2; size = 2;
maxNodes = 30; maxNodes = 15;
laserRange = 9.5f; laserRange = 9.5f;
}}; }};

6
core/src/mindustry/content/Fx.java
View File

@@ -901,7 +901,7 @@ public class Fx{
}), }),
shootSmallFlame = new Effect(32f, e -> { shootSmallFlame = new Effect(32f, 80f, e -> {
color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin()); color(Pal.lightFlame, Pal.darkFlame, Color.gray, e.fin());
randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> { randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> {
@@ -910,7 +910,7 @@ public class Fx{
}), }),
shootPyraFlame = new Effect(33f, e -> { shootPyraFlame = new Effect(33f, 80f, e -> {
color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin()); color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.gray, e.fin());
randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> { randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> {
@@ -919,7 +919,7 @@ public class Fx{
}), }),
shootLiquid = new Effect(40f, e -> { shootLiquid = new Effect(40f, 80f, e -> {
color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f)); color(e.color, Color.white, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> { randLenVectors(e.id, 6, e.finpow() * 60f, e.rotation, 11f, (x, y) -> {

2
core/src/mindustry/entities/Effect.java
View File

@@ -40,7 +40,7 @@ public class Effect{
} }
public Effect(float life, Cons<EffectContainer> renderer){ public Effect(float life, Cons<EffectContainer> renderer){
this(life, 28f, renderer); this(life, 32f, renderer);
} }
public Effect ground(){ public Effect ground(){

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

@@ -29,7 +29,7 @@ public class BufferedItemBridge extends ExtendingItemBridge{
} }
Item item = buffer.poll(speed / timeScale); Item item = buffer.poll(speed / timeScale);
if(timer(timerAccept, 4) && item != null && other.acceptItem(this, item)){ if(timer(timerAccept, 4 / timeScale) && item != null && other.acceptItem(this, item)){
cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f); cycleSpeed = Mathf.lerpDelta(cycleSpeed, 4f, 0.05f);
other.handleItem(this, item); other.handleItem(this, item);
buffer.remove(); buffer.remove();

1
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -41,7 +41,6 @@ public class ItemBridge extends Block{
hasItems = true; hasItems = true;
unloadable = false; unloadable = false;
group = BlockGroup.transportation; group = BlockGroup.transportation;
canOverdrive = false;
noUpdateDisabled = true; noUpdateDisabled = true;
//point2 config is relative //point2 config is relative

1
core/src/mindustry/world/blocks/liquid/LiquidBridge.java
View File

@@ -15,6 +15,7 @@ public class LiquidBridge extends ItemBridge{
hasItems = false; hasItems = false;
hasLiquids = true; hasLiquids = true;
outputsLiquid = true; outputsLiquid = true;
canOverdrive = false;
group = BlockGroup.liquids; group = BlockGroup.liquids;
} }

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=8665da900c8f24c101dd8ab33a910cfa1a58c37c archash=5c7c5e8d8728880e20f9c39a888ee03612dc1071