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

New splash damage algorithm

Browse Source
This commit is contained in:
Anuken
2021-02-15 18:00:47 -05:00
parent 710a55dc2d
commit c942331117
5 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Fx.java
View File

@@ -1609,6 +1609,12 @@ public class Fx{
Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
}),
lightBlock = new Effect(60, e -> {
color(e.color);
alpha(e.fout() * 1);
Fill.square(e.x, e.y, e.rotation * tilesize / 2f);
}),
overdriveBlockFull = new Effect(60, e -> {
color(e.color);
alpha(e.fslope() * 0.4f);

14
core/src/mindustry/content/UnitTypes.java
View File

@@ -565,9 +565,9 @@ public class UnitTypes implements ContentList{
hitEffect = Fx.pulverize;
lifetime = 10f;
speed = 1f;
splashDamageRadius = 70f;
splashDamageRadius = 58f;
instantDisappear = true;
splashDamage = 80f;
splashDamage = 85f;
killShooter = true;
hittable = false;
collidesAir = true;
@@ -769,7 +769,7 @@ public class UnitTypes implements ContentList{
width = height = 19f;
collidesTiles = true;
ammoMultiplier = 4f;
splashDamageRadius = 95f;
splashDamageRadius = 80f;
splashDamage = 65f;
backColor = Pal.sapBulletBack;
frontColor = lightningColor = Pal.sapBullet;
@@ -867,7 +867,7 @@ public class UnitTypes implements ContentList{
width = height = 25f;
collidesTiles = collides = true;
ammoMultiplier = 4f;
splashDamageRadius = 90f;
splashDamageRadius = 80f;
splashDamage = 75f;
backColor = Pal.sapBulletBack;
frontColor = lightningColor = Pal.sapBullet;
@@ -888,7 +888,7 @@ public class UnitTypes implements ContentList{
lifetime = 90f;
width = height = 20f;
collidesTiles = false;
splashDamageRadius = 80f;
splashDamageRadius = 70f;
splashDamage = 40f;
backColor = Pal.sapBulletBack;
frontColor = lightningColor = Pal.sapBullet;
@@ -1367,7 +1367,7 @@ public class UnitTypes implements ContentList{
healPercent = 15f;
splashDamage = 230f;
splashDamageRadius = 120f;
splashDamageRadius = 81f;
}};
}});
}};
@@ -1537,7 +1537,7 @@ public class UnitTypes implements ContentList{
width = 15f;
collidesTiles = false;
ammoMultiplier = 4f;
splashDamageRadius = 60f;
splashDamageRadius = 50f;
splashDamage = 80f;
backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow;