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

Balancing

Browse Source
This commit is contained in:
Anuken
2020-05-21 11:04:48 -04:00
parent 42ba97f872
commit 684b84310b
10 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ public class Bullets implements ContentList{
@Override
public void load(){
artilleryDense = new ArtilleryBulletType(3f, 0, "shell"){{
artilleryDense = new ArtilleryBulletType(3f, 12, "shell"){{
hitEffect = Fx.flakExplosion;
knockback = 0.8f;
lifetime = 50f;
@@ -64,7 +64,7 @@ public class Bullets implements ContentList{
despawnEffect = Fx.none;
}};
artilleryPlastic = new ArtilleryBulletType(3.4f, 0, "shell"){{
artilleryPlastic = new ArtilleryBulletType(3.4f, 12, "shell"){{
hitEffect = Fx.plasticExplosion;
knockback = 1f;
lifetime = 55f;
@@ -78,7 +78,7 @@ public class Bullets implements ContentList{
frontColor = Pal.plastaniumFront;
}};
artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{
artilleryHoming = new ArtilleryBulletType(3f, 12, "shell"){{
hitEffect = Fx.flakExplosion;
knockback = 0.8f;
lifetime = 45f;
@@ -90,7 +90,7 @@ public class Bullets implements ContentList{
homingRange = 50f;
}};
artilleryIncendiary = new ArtilleryBulletType(3f, 0, "shell"){{
artilleryIncendiary = new ArtilleryBulletType(3f, 12, "shell"){{
hitEffect = Fx.blastExplosion;
knockback = 0.8f;
lifetime = 60f;
@@ -104,7 +104,7 @@ public class Bullets implements ContentList{
trailEffect = Fx.incendTrail;
}};
artilleryExplosive = new ArtilleryBulletType(2f, 0, "shell"){{
artilleryExplosive = new ArtilleryBulletType(2f, 12, "shell"){{
hitEffect = Fx.blastExplosion;
knockback = 0.8f;
lifetime = 70f;
@@ -115,6 +115,9 @@ public class Bullets implements ContentList{
splashDamage = 50f;
backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow;
status = StatusEffects.blasted;
statusDuration = 60f;
}};
artilleryUnit = new ArtilleryBulletType(2f, 8, "shell"){{
@@ -192,6 +195,9 @@ public class Bullets implements ContentList{
//default bullet type, no changes
shootEffect = Fx.shootBig;
ammoMultiplier = 4f;
status = StatusEffects.blasted;
statusDuration = 60f;
}};
flakSurge = new FlakBulletType(4f, 7){{
@@ -212,6 +218,9 @@ public class Bullets implements ContentList{
lifetime = 150f;
hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion;
status = StatusEffects.blasted;
statusDuration = 60f;
}};
missileIncendiary = new MissileBulletType(2.9f, 12, "missile"){{
@@ -361,19 +370,19 @@ public class Bullets implements ContentList{
despawnEffect = Fx.hitBulletSmall;
}};
standardDenseBig = new BasicBulletType(7f, 42, "bullet"){{
standardDenseBig = new BasicBulletType(7f, 44, "bullet"){{
bulletWidth = 15f;
bulletHeight = 21f;
shootEffect = Fx.shootBig;
}};
standardThoriumBig = new BasicBulletType(8f, 65, "bullet"){{
standardThoriumBig = new BasicBulletType(8f, 67, "bullet"){{
bulletWidth = 16f;
bulletHeight = 23f;
shootEffect = Fx.shootBig;
}};
standardIncendiaryBig = new BasicBulletType(7f, 38, "bullet"){{
standardIncendiaryBig = new BasicBulletType(7f, 44, "bullet"){{
bulletWidth = 16f;
bulletHeight = 21f;
frontColor = Pal.lightishOrange;
@@ -591,8 +600,7 @@ public class Bullets implements ContentList{
@Override
public void init(Bulletc b){
//TODO owners are never players...
Lightning.create(b.team(), Pal.lancerLaser, damage * (b.owner() instanceof Playerc ? state.rules.playerDamageMultiplier : 1f), b.x(), b.y(), b.rotation(), 30);
Lightning.create(b.team(), Pal.lancerLaser, damage * (b.owner().isLocal() ? state.rules.playerDamageMultiplier : 1f), b.x(), b.y(), b.rotation(), 30);
}
};
@@ -617,6 +625,9 @@ public class Bullets implements ContentList{
hitEffect = Fx.flakExplosion;
shootEffect = Fx.none;
smokeEffect = Fx.none;
status = StatusEffects.blasted;
statusDuration = 60f;
}};
bombIncendiary = new BombBulletType(7f, 10f, "shell"){{

13
core/src/mindustry/content/StatusEffects.java
View File

@@ -9,7 +9,7 @@ import mindustry.type.StatusEffect;
import static mindustry.Vars.*;
public class StatusEffects implements ContentList{
public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, corroded, boss;
public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, blasted, corroded, boss;
@Override
public void load(){
@@ -17,13 +17,13 @@ public class StatusEffects implements ContentList{
none = new StatusEffect("none");
burning = new StatusEffect("burning"){{
damage = 0.06f;
damage = 0.075f;
effect = Fx.burning;
init(() -> {
opposite(wet,freezing);
trans(tarred, ((unit, time, newTime, result) -> {
unit.damage(1f);
unit.damage(8f);
Fx.burning.at(unit.x() + Mathf.range(unit.bounds() / 2f), unit.y() + Mathf.range(unit.bounds() / 2f));
result.set(this, Math.min(time + newTime, 300f));
}));
@@ -37,6 +37,11 @@ public class StatusEffects implements ContentList{
init(() -> {
opposite(melting, burning);
trans(blasted, ((unit, time, newTime, result) -> {
unit.damage(18f);
result.set(this, time);
}));
});
}};
@@ -98,6 +103,8 @@ public class StatusEffects implements ContentList{
shocked = new StatusEffect("shocked");
blasted = new StatusEffect("blasted");
//no effects, just small amounts of damage.
corroded = new StatusEffect("corroded"){{
damage = 0.1f;

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

@@ -299,7 +299,6 @@ public class UnitTypes implements ContentList{
}};
/*
chaosArray = new UnitType("chaos-array", GroundUnit::new){{
maxVelocity = 0.68f;
speed = 0.12f;