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_vanquish_conquer #3

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

Rework_vanquish_conquer #3

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ba47a0
Rework_vanquish_conquer
Frolonov Mar 8, 2025
8ce7f07
fix syntax
Frolonov Mar 8, 2025
22dd137
damage tweak
Frolonov Mar 8, 2025
43f0fbd
bullet property tweak
Frolonov Mar 8, 2025
3835e40
damage tweak
Frolonov Mar 8, 2025
9ac7689
damage tweak
Frolonov Mar 8, 2025
8f8dea4
damage tweak
Frolonov Mar 8, 2025
b26e095
damage tweak
Frolonov Mar 8, 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
99 changes: 46 additions & 53 deletions core/src/mindustry/content/UnitTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2688,12 +2688,14 @@ public static void load(){
hitSize = 28f;
treadPullOffset = 4;
speed = 0.63f;
rotateSpeed = 1.3f;
health = 11000;
armor = 20f;
armor = 26f;
itemCapacity = 0;
crushDamage = 13f / 5f;
treadRects = new Rect[]{new Rect(22 - 154f/2f, 16 - 154f/2f, 28, 130)};

hovering = true;

weapons.add(new Weapon("vanquish-weapon"){{
shootSound = Sounds.mediumCannon;
layerOffset = 0.0001f;
Expand All @@ -2702,53 +2704,49 @@ public static void load(){
shake = 5f;
recoil = 4f;
rotate = true;
rotateSpeed = 1f;
rotateSpeed = 1.2f;
mirror = false;
x = 0f;
y = 0;
shadow = 28f;
heatColor = Color.valueOf("f9350f");
cooldownTime = 80f;

bullet = new BasicBulletType(8f, 190){{
bullet = new BasicBulletType(8f, 240f){{
sprite = "missile-large";
width = 9.5f;
height = 13f;
lifetime = 18f;
lifetime = 23f;
hitSize = 6f;
shootEffect = Fx.shootTitan;
smokeEffect = Fx.shootSmokeTitan;
pierceCap = 2;
pierce = true;
pierceBuilding = true;
hitColor = backColor = trailColor = Color.valueOf("feb380");
frontColor = Color.white;
trailWidth = 3.1f;
trailLength = 8;
hitEffect = despawnEffect = Fx.blastExplosion;
splashDamageRadius = 20f;
splashDamage = 50f;
splashDamageRadius = 16f;
splashDamage = 80f;

fragOnHit = false;
fragRandomSpread = 0f;
fragSpread = 10f;
fragSpread = 12f;
fragBullets = 5;
fragVelocityMin = 1f;
despawnSound = Sounds.dullExplosion;

fragBullet = new BasicBulletType(8f, 35){{
fragBullet = new ArtilleryBulletType(3f, 45f){{
sprite = "missile-large";
width = 8f;
height = 12f;
lifetime = 15f;
lifetime = 12f;
hitSize = 4f;
hitColor = backColor = trailColor = Color.valueOf("feb380");
frontColor = Color.white;
trailWidth = 2.8f;
trailLength = 6;
hitEffect = despawnEffect = Fx.blastExplosion;
splashDamageRadius = 10f;
splashDamage = 20f;
splashDamageRadius = 32f;
splashDamage = 50f;
}};
}};
}});
Expand All @@ -2757,15 +2755,15 @@ public static void load(){
for(float f : new float[]{34f / 4f, -36f / 4f}){
int fi = i ++;
weapons.add(new Weapon("vanquish-point-weapon"){{
reload = 35f + fi * 5;
reload = 15f;
x = 48f / 4f;
y = f;
shootY = 5.5f;
recoil = 2f;
rotate = true;
rotateSpeed = 2f;
rotateSpeed = 2.6f;

bullet = new BasicBulletType(4.5f, 25){{
bullet = new BasicBulletType(6f, 40f){{
width = 6.5f;
height = 11f;
shootEffect = Fx.sparkShoot;
Expand All @@ -2781,26 +2779,26 @@ public static void load(){
}};

conquer = new TankUnitType("conquer"){{
hitSize = 46f;
hitSize = 42f;
treadPullOffset = 1;
speed = 0.48f;
speed = 0.65f;
health = 22000;
armor = 26f;
crushDamage = 25f / 5f;
rotateSpeed = 0.8f;

armor = 45f;
crushDamage = 5f;
rotateSpeed = 1.1f;
hovering = true;
float xo = 231f/2f, yo = 231f/2f;
treadRects = new Rect[]{new Rect(27 - xo, 152 - yo, 56, 73), new Rect(24 - xo, 51 - 9 - yo, 29, 17), new Rect(59 - xo, 18 - 9 - yo, 39, 19)};

weapons.add(new Weapon("conquer-weapon"){{
shootSound = Sounds.largeCannon;
layerOffset = 0.1f;
reload = 100f;
reload = 120f;
shootY = 32.5f;
shake = 5f;
recoil = 5f;
rotate = true;
rotateSpeed = 0.6f;
rotateSpeed = 1.4f;
mirror = false;
x = 0f;
y = -2f;
Expand Down Expand Up @@ -2867,25 +2865,25 @@ public static void load(){
}});
}

bullet = new BasicBulletType(8f, 360f){{
bullet = new BasicBulletType(7f, 460f){{
sprite = "missile-large";
width = 12f;
height = 20f;
lifetime = 35f;
lifetime = 40f;
hitSize = 6f;

smokeEffect = Fx.shootSmokeTitan;
pierceCap = 3;
pierceCap = 5;
pierce = true;
pierceBuilding = true;
collidesTiles = false;
hitColor = backColor = trailColor = Color.valueOf("feb380");
frontColor = Color.white;
trailWidth = 4f;
trailLength = 9;
hitEffect = despawnEffect = Fx.massiveExplosion;

shootEffect = new ExplosionEffect(){{
lifetime = 40f;
lifetime = 32f;
waveStroke = 4f;
waveColor = sparkColor = trailColor;
waveRad = 15f;
Expand All @@ -2899,34 +2897,25 @@ public static void load(){
sparkStroke = 3f;
}};

int count = 6;
for(int j = 0; j < count; j++){
int s = j;
for(int i : Mathf.signs){
float fin = 0.05f + (j + 1) / (float)count;
float spd = speed;
float life = lifetime / Mathf.lerp(fin, 1f, 0.5f);
spawnBullets.add(new BasicBulletType(spd * fin, 60){{
drag = 0.002f;
intervalBullet = new BasicBulletType(2f, 20f){{
drag = 0.01f;
width = 12f;
height = 11f;
lifetime = life + 5f;
lifetime = 27f;
weaveRandom = false;
hitSize = 5f;
pierceCap = 2;
pierce = true;
pierceBuilding = true;
collidesTiles = false;
hitColor = backColor = trailColor = Color.valueOf("feb380");
frontColor = Color.white;
trailWidth = 2.5f;
trailLength = 7;
weaveScale = (3f + s/2f) / 1.2f;
weaveMag = i * (4f - fin * 2f);
weaveScale = 3f;
weaveMag = 2f;

splashDamage = 65f;
splashDamageRadius = 30f;
splashDamage = 140f;
splashDamageRadius = 40f;
despawnEffect = new ExplosionEffect(){{
lifetime = 50f;
lifetime = 30f;
waveStroke = 4f;
waveColor = sparkColor = trailColor;
waveRad = 30f;
Expand All @@ -2939,9 +2928,13 @@ public static void load(){
sparkLen = 3f;
sparkStroke = 1.5f;
}};
}});
}
}
}};
bulletInterval = 5f;
intervalRandomSpread = 0f;
intervalBullets = 2;
intervalAngle = 180f;
intervalSpread = 330f;

}};
}});

Expand Down