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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-03-02 23:06:14 -05:00
parent 4a4a9f267b
commit 89b439c3c8
12 changed files with 1168 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -731,7 +731,7 @@ public class Blocks implements ContentList{
rotaryPump = new Pump("rotary-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 140, Items.lead, 100, Items.silicon, 40, Items.titanium, 70));
pumpAmount = 0.2f;
pumpAmount = 0.8f;
consumes.power(1.50f);
liquidCapacity = 30f;
hasPower = true;
@@ -740,7 +740,7 @@ public class Blocks implements ContentList{
thermalPump = new Pump("thermal-pump"){{
requirements(Category.liquid, ItemStack.with(Items.copper, 160, Items.lead, 130, Items.silicon, 60, Items.titanium, 80, Items.thorium, 70));
pumpAmount = 0.22f;
pumpAmount = 1.95f;
consumes.power(0.30f);
liquidCapacity = 40f;
hasPower = true;

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

@@ -359,6 +359,7 @@ public class Bullets implements ContentList{
float healPercent = 3f;
{
shootEffect = Fx.shootHeal;
hitEffect = Fx.hitLaser;
despawnEffect = Fx.hitLaser;
collidesTeam = true;