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

Merge remote-tracking branch 'upstream/master' into ground-support-heal

Browse Source
This commit is contained in:
Leonwang4234
2020-10-16 08:49:55 -07:00
parent ba77f8e2aa f5decdaa1c
commit 69b7d15beb
76 changed files with 968 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1713,7 +1713,7 @@ public class Blocks implements ContentList{
despawnEffect = Fx.instBomb;
trailSpacing = 20f;
damage = 1350;
tileDamageMultiplier = 0.5f;
tileDamageMultiplier = 0.3f;
speed = brange;
hitShake = 6f;
ammoMultiplier = 1f;

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

@@ -510,7 +510,7 @@ public class Bullets implements ContentList{
speed = 4f;
knockback = 1.3f;
puddleSize = 8f;
damage = 6f;
damage = 5f;
drag = 0.001f;
ammoMultiplier = 2f;
statusDuration = 60f * 4f;