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

stuff

Browse Source
This commit is contained in:
Anuken
2019-04-05 09:26:31 -04:00
parent 330820062f
commit efed11eb97
23 changed files with 2335 additions and 2331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -519,8 +519,8 @@ public class Blocks implements ContentList{
cryofluidMixer = new GenericCrafter("cryofluidmixer"){{
requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.thorium, 90));
outputLiquid = new LiquidStack(Liquids.cryofluid, 0.6f);
craftTime = 5f;
outputLiquid = new LiquidStack(Liquids.cryofluid, 7.2f);
craftTime = 60f;
size = 2;
hasPower = true;
hasItems = true;
@@ -531,7 +531,7 @@ public class Blocks implements ContentList{
consumes.power(1f);
consumes.item(Items.titanium);
consumes.liquid(Liquids.water, 0.6f);
consumes.liquid(Liquids.water, 7.2f);
int liquidRegion = reg("-liquid"), topRegion = reg("-top"), bottomRegion = reg("-bottom");
@@ -1450,12 +1450,12 @@ public class Blocks implements ContentList{
Items.surgealloy, Bullets.flakSurge
);
xRand = 4f;
reload = 7f;
range = 170f;
reload = 6f;
range = 190f;
size = 3;
recoil = 3f;
rotatespeed = 10f;
inaccuracy = 13f;
inaccuracy = 10f;
shootCone = 30f;
health = 145 * size * size;

1
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -626,7 +626,6 @@ public class Bullets implements ContentList{
slagShot = new LiquidBulletType(Liquids.slag){{
damage = 4;
speed = 1.9f;
drag = 0.03f;
}};