Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework quell disrupt #10542

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Rework quell disrupt #10542

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d08890
Rework_quell_disrupt
Frolonov Mar 9, 2025
d8dacc2
syntax fix
Frolonov Mar 9, 2025
afd91e0
range tweak
Frolonov Mar 9, 2025
fcdcd06
mobility tweak
Frolonov Mar 9, 2025
655cd9d
balancing tweak
Frolonov Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 62 additions & 48 deletions core/src/mindustry/content/UnitTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3809,15 +3809,15 @@ public static void load(){
quell = new ErekirUnitType("quell"){{
aiController = FlyingFollowAI::new;
envDisabled = 0;

fogRadius = 44f;
lowAltitude = false;
flying = true;
drag = 0.06f;
speed = 1.1f;
speed = 0.95f;
rotateSpeed = 3.2f;
accel = 0.1f;
health = 6000f;
armor = 4f;
health = 5600f;
armor = 9f;
hitSize = 36f;
payloadCapacity = Mathf.sqr(3f) * tilePayload;
researchCostMultiplier = 0f;
Expand All @@ -3837,41 +3837,36 @@ public static void load(){
y = 5 / 4f;
rotate = true;
rotateSpeed = 2f;
reload = 55f;
reload = 60f;
layerOffset = -0.001f;
recoil = 1f;
rotationLimit = 60f;

bullet = new BulletType(){{
bullet = new ArtilleryBulletType(8f, 30){{
shootEffect = Fx.shootBig;
smokeEffect = Fx.shootBigSmoke2;
despawnEffect = hitEffect = new ExplosionEffect(){{
waveColor = Pal.sapBullet;
smokeColor = Color.gray;
sparkColor = Pal.sap;
waveStroke = 4f;
waveRad = 40f;
}};
hitColor = backColor = trailColor = Pal.suppress;
shake = 1f;
speed = 0f;
keepVelocity = false;
collidesAir = false;

spawnUnit = new MissileUnitType("quell-missile"){{
targetAir = false;
speed = 4.3f;
maxRange = 6f;
lifetime = 60f * 1.4f;
outlineColor = Pal.darkOutline;
engineColor = trailColor = Pal.sapBulletBack;
engineLayer = Layer.effect;
health = 45;
loopSoundVolume = 0.1f;

weapons.add(new Weapon(){{
shootCone = 360f;
mirror = false;
reload = 1f;
shootOnDeath = true;
bullet = new ExplosionBulletType(110f, 25f){{
shootEffect = Fx.massiveExplosion;
collidesAir = false;
}};
}});
}};
sprite = "missile-large";
width = 9f;
height = 12f;
trailWidth = 2.5f;
trailLength = 12;
lifetime = 31f;
hitSize = 6f;
homingPower = 0.08f;
knockback = 1.6f;
splashDamage = 100f;
splashDamageRadius = 28f;
}};
}});

Expand All @@ -3884,12 +3879,12 @@ public static void load(){
disrupt = new ErekirUnitType("disrupt"){{
aiController = FlyingFollowAI::new;
envDisabled = 0;

fogRadius = 60f;
lowAltitude = false;
flying = true;
drag = 0.07f;
speed = 1f;
rotateSpeed = 2f;
speed = 1.1f;
rotateSpeed = 0.8f;
accel = 0.1f;
health = 12000f;
armor = 9f;
Expand All @@ -3900,12 +3895,14 @@ public static void load(){
engineSize = 6f;
engineOffset = 25.25f;

float orbRad = 5f, partRad = 3f;
float orbRad = 6f, partRad = 4f;
int parts = 10;

abilities.add(new SuppressionFieldAbility(){{
orbRadius = orbRad;
particleSize = partRad;
reload = 150;
range = 360;
y = 10f;
particles = parts;
}});
Expand All @@ -3928,18 +3925,32 @@ public static void load(){
y = -10f / 4f;
mirror = true;
rotate = true;
rotateSpeed = 0.4f;
reload = 70f;
rotateSpeed = 0.8f;
reload = 216f;
layerOffset = -20f;
recoil = 1f;
rotationLimit = 22f;
rotationLimit = 9f;
minWarmup = 0.95f;
shootWarmupSpeed = 0.1f;
shootY = 2f;
shootCone = 40f;
shoot.shots = 3;
shoot.shotDelay = 5f;
inaccuracy = 28f;
shootCone = 12f;
alternate = false;
shoot = new ShootBarrel(){{
barrels = new float[]{
0, 0, -72f,
0, 0, -56f,
0, 0, 0,
0, 0, -48f,
0, 0, -32f,
0, 0, 0,
0, 0, -24f,
0, 0, -8f,
0, 0, 0
};
shots = 9;
shotDelay = 3f;
}};
inaccuracy = 0f;

parts.add(new RegionPart("-blade"){{
heatProgress = PartProgress.warmup;
Expand All @@ -3965,17 +3976,20 @@ public static void load(){

spawnUnit = new MissileUnitType("disrupt-missile"){{
targetAir = false;
speed = 4.6f;
speed = 6f;
maxRange = 5f;
outlineColor = Pal.darkOutline;
health = 70;
homingDelay = 10f;
health = 240;
lifetime = 62f;
homingDelay = 20f;
homingPower = 0.04f;
lowAltitude = true;
engineSize = 3f;
engineColor = trailColor = Pal.sapBulletBack;
engineLayer = Layer.effect;
deathExplosionEffect = Fx.none;
loopSoundVolume = 0.1f;
fogRadius = 6f;

parts.add(new ShapePart(){{
layer = Layer.effect;
Expand All @@ -4002,20 +4016,20 @@ public static void load(){
mirror = false;
reload = 1f;
shootOnDeath = true;
bullet = new ExplosionBulletType(140f, 25f){{
bullet = new ExplosionBulletType(220f, 44f){{
collidesAir = false;
suppressionRange = 140f;
shootEffect = new ExplosionEffect(){{
lifetime = 50f;
lifetime = 30f;
waveStroke = 5f;
waveLife = 8f;
waveColor = Color.white;
sparkColor = smokeColor = Pal.suppress;
waveRad = 40f;
smokeSize = 4f;
smokes = 7;
smokes = 5;
smokeSizeBase = 0f;
sparks = 10;
sparks = 6;
sparkRad = 40f;
sparkLen = 6f;
sparkStroke = 2f;
Expand Down