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

Make crater speed configurable

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-03 12:19:33 +01:00
parent 0807e1bd25
commit d843f29e09
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -894,8 +894,8 @@ public class Blocks implements ContentList{
plastaniumConveyor = new CraterConveyor("plastanium-conveyor"){{ plastaniumConveyor = new CraterConveyor("plastanium-conveyor"){{
requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1)); requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1));
itemCapacity = 8; itemCapacity = 8;
speed = 0.075f;
health = 75; health = 75;
speed = 0f;
}}; }};
armoredConveyor = new ArmoredItemConveyor("armored-conveyor"){{ armoredConveyor = new ArmoredItemConveyor("armored-conveyor"){{

9
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -15,8 +15,7 @@ import mindustry.graphics.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*;
import static mindustry.Vars.itemSize;
public class CraterConveyor extends BaseConveyor{ public class CraterConveyor extends BaseConveyor{
private TextureRegion start, end, crater; private TextureRegion start, end, crater;
@@ -118,9 +117,9 @@ public class CraterConveyor extends BaseConveyor{
} }
if(entity.crater != null){ if(entity.crater != null){
entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), 0.075f); entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), speed);
entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), 0.075f); entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), speed);
entity.crater.rotation = Mathf.slerpDelta(entity.crater.rotation, entity.crater.face, 0.1f); entity.crater.rotation = Mathf.slerpDelta(entity.crater.rotation, entity.crater.face, speed * 2);
} }
} }