mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4729

Browse Source
This commit is contained in:
Anuken 2021-02-18 17:00:23 -05:00
parent 06b8dd61c7
commit 5a58f9c71a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ public class Bullets implements ContentList{
lifetime = 80f;
width = height = 11f;
collidesTiles = false;
splashDamageRadius = 25f;
splashDamageRadius = 25f * 0.75f;
splashDamage = 33f;
}};
@ -84,7 +84,7 @@ public class Bullets implements ContentList{
lifetime = 80f;
width = height = 13f;
collidesTiles = false;
splashDamageRadius = 35f;
splashDamageRadius = 35f * 0.75f;
splashDamage = 45f;
fragBullet = artilleryPlasticFrag;
fragBullets = 10;
@ -98,7 +98,7 @@ public class Bullets implements ContentList{
lifetime = 80f;
width = height = 11f;
collidesTiles = false;
splashDamageRadius = 25f;
splashDamageRadius = 25f * 0.75f;
splashDamage = 33f;
reloadMultiplier = 1.2f;
ammoMultiplier = 3f;
@ -112,7 +112,7 @@ public class Bullets implements ContentList{
lifetime = 80f;
width = height = 13f;
collidesTiles = false;
splashDamageRadius = 25f;
splashDamageRadius = 25f * 0.75f;
splashDamage = 35f;
status = StatusEffects.burning;
frontColor = Pal.lightishOrange;
@ -128,7 +128,7 @@ public class Bullets implements ContentList{
width = height = 14f;
collidesTiles = false;
ammoMultiplier = 4f;
splashDamageRadius = 45f;
splashDamageRadius = 45f * 0.75f;
splashDamage = 50f;
backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow;

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

@ -138,7 +138,7 @@ public class UnitTypes implements ContentList{
collides = true;
collidesTiles = true;
splashDamageRadius = 28f;
splashDamage = 52f;
splashDamage = 54f;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
}};
@ -1537,7 +1537,7 @@ public class UnitTypes implements ContentList{
width = 15f;
collidesTiles = false;
ammoMultiplier = 4f;
splashDamageRadius = 50f;
splashDamageRadius = 40f;
splashDamage = 80f;
backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow;

2
core/src/mindustry/entities/Damage.java
View File

@ -380,7 +380,7 @@ public class Damage{
//this needs to be compensated
if(in != null && in.team != team && in.block.size > 1 && in.health > damage){
//deal the damage of an entire side + 1, to be equivalent with maximum 'standard' damage
in.damage(damage * Math.min((in.block.size + 1), baseRadius * 0.44f));
in.damage(damage * Math.min((in.block.size), baseRadius * 0.45f));
//no need to continue with the explosion
return;
}

4
core/src/mindustry/entities/comp/UnitComp.java
View File

@ -140,7 +140,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
case commanded -> controller instanceof FormationAI ? 1 : 0;
case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;
default -> 0;
default -> Float.NaN;
};
}
@ -162,7 +162,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
@Override
public double sense(Content content){
if(content == stack().item) return stack().amount;
return 0;
return Float.NaN;
}
@Override