mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Crafter progress modulo / Segment buff

Browse Source
This commit is contained in:
Anuken 2021-02-23 10:47:54 -05:00
parent d7f848f8cd
commit 08e36aca98
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1606,12 +1606,12 @@ public class Blocks implements ContentList{
requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phaseFabric, 40)); requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phaseFabric, 40));
health = 250 * size * size; health = 250 * size * size;
range = 160f; range = 180f;
hasPower = true; hasPower = true;
consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null); consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null);
size = 2; size = 2;
shootLength = 5f; shootLength = 5f;
bulletDamage = 25f; bulletDamage = 30f;
reloadTime = 9f; reloadTime = 9f;
}}; }};

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

@ -172,12 +172,10 @@ public class ItemBridge extends Block{
public void playerPlaced(Object config){ public void playerPlaced(Object config){
super.playerPlaced(config); super.playerPlaced(config);
//if(config == null){ Tile link = findLink(tile.x, tile.y);
Tile link = findLink(tile.x, tile.y); if(linkValid(tile, link) && !proximity.contains(link.build)){
if(linkValid(tile, link) && !proximity.contains(link.build)){ link.build.configure(tile.pos());
link.build.configure(tile.pos()); }
}
//}
lastBuild = this; lastBuild = this;
} }

2
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@ -119,7 +119,7 @@ public class GenericCrafter extends Block{
} }
craftEffect.at(x, y); craftEffect.at(x, y);
progress = 0f; progress %= 1f;
} }
if(outputItem != null && timer(timerDump, dumpTime)){ if(outputItem != null && timer(timerDump, dumpTime)){