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
+5 -5
View File
@@ -63,7 +63,7 @@ public class Bullets implements ContentList{
lifetime = 80f; lifetime = 80f;
width = height = 11f; width = height = 11f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 25f; splashDamageRadius = 25f * 0.75f;
splashDamage = 33f; splashDamage = 33f;
}}; }};
@@ -84,7 +84,7 @@ public class Bullets implements ContentList{
lifetime = 80f; lifetime = 80f;
width = height = 13f; width = height = 13f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 35f; splashDamageRadius = 35f * 0.75f;
splashDamage = 45f; splashDamage = 45f;
fragBullet = artilleryPlasticFrag; fragBullet = artilleryPlasticFrag;
fragBullets = 10; fragBullets = 10;
@@ -98,7 +98,7 @@ public class Bullets implements ContentList{
lifetime = 80f; lifetime = 80f;
width = height = 11f; width = height = 11f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 25f; splashDamageRadius = 25f * 0.75f;
splashDamage = 33f; splashDamage = 33f;
reloadMultiplier = 1.2f; reloadMultiplier = 1.2f;
ammoMultiplier = 3f; ammoMultiplier = 3f;
@@ -112,7 +112,7 @@ public class Bullets implements ContentList{
lifetime = 80f; lifetime = 80f;
width = height = 13f; width = height = 13f;
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 25f; splashDamageRadius = 25f * 0.75f;
splashDamage = 35f; splashDamage = 35f;
status = StatusEffects.burning; status = StatusEffects.burning;
frontColor = Pal.lightishOrange; frontColor = Pal.lightishOrange;
@@ -128,7 +128,7 @@ public class Bullets implements ContentList{
width = height = 14f; width = height = 14f;
collidesTiles = false; collidesTiles = false;
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamageRadius = 45f; splashDamageRadius = 45f * 0.75f;
splashDamage = 50f; splashDamage = 50f;
backColor = Pal.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow; frontColor = Pal.missileYellow;
+2 -2
View File
@@ -138,7 +138,7 @@ public class UnitTypes implements ContentList{
collides = true; collides = true;
collidesTiles = true; collidesTiles = true;
splashDamageRadius = 28f; splashDamageRadius = 28f;
splashDamage = 52f; splashDamage = 54f;
backColor = Pal.bulletYellowBack; backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow; frontColor = Pal.bulletYellow;
}}; }};
@@ -1537,7 +1537,7 @@ public class UnitTypes implements ContentList{
width = 15f; width = 15f;
collidesTiles = false; collidesTiles = false;
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamageRadius = 50f; splashDamageRadius = 40f;
splashDamage = 80f; splashDamage = 80f;
backColor = Pal.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow; frontColor = Pal.missileYellow;
+1 -1
View File
@@ -380,7 +380,7 @@ public class Damage{
//this needs to be compensated //this needs to be compensated
if(in != null && in.team != team && in.block.size > 1 && in.health > damage){ 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 //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 //no need to continue with the explosion
return; return;
} }
@@ -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 controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
case commanded -> controller instanceof FormationAI ? 1 : 0; case commanded -> controller instanceof FormationAI ? 1 : 0;
case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 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 @Override
public double sense(Content content){ public double sense(Content content){
if(content == stack().item) return stack().amount; if(content == stack().item) return stack().amount;
return 0; return Float.NaN;
} }
@Override @Override